Index: cod_events/cod_events.features.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_events/cod_events.features.inc,v
retrieving revision 1.3
diff -u -p -r1.3 cod_events.features.inc
--- cod_events/cod_events.features.inc	19 Oct 2010 18:44:10 -0000	1.3
+++ cod_events/cod_events.features.inc	20 Oct 2010 15:14:39 -0000
@@ -9,3 +9,23 @@ function cod_events_ctools_plugin_api() 
     return array("version" => 1);
   }
 }
+
+/**
+ * Implementation of hook_node_info().
+ */
+function cod_events_node_info() {
+  $items = array(
+    'event' => array(
+      'name' => t('Event'),
+      'module' => 'features',
+      'description' => t('Provides free and paid event registration on the Event content type with the cod_events and cod_events_paid features.'),
+      'has_title' => '1',
+      'title_label' => t('Title'),
+      'has_body' => '1',
+      'body_label' => t('Body'),
+      'min_word_count' => '0',
+      'help' => '',
+    ),
+  );
+  return $items;
+}
Index: cod_events/cod_events.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_events/cod_events.info,v
retrieving revision 1.7
diff -u -p -r1.7 cod_events.info
--- cod_events/cod_events.info	19 Oct 2010 18:44:10 -0000	1.7
+++ cod_events/cod_events.info	20 Oct 2010 15:14:39 -0000
@@ -5,21 +5,25 @@ dependencies[] = "date_popup"
 dependencies[] = "features"
 dependencies[] = "imagefield"
 dependencies[] = "strongarm"
-dependencies[] = "uc_cart"
-dependencies[] = "uc_order"
-dependencies[] = "uc_payment"
-dependencies[] = "uc_product"
-dependencies[] = "uc_signup"
-dependencies[] = "uc_store"
 description = "Provides free & paid event registration and administrative signup lists"
 features[content][] = "event-field_dates"
 features[content][] = "event-field_image_cache"
 features[ctools][] = "strongarm:strongarm:1"
+features[node][] = "event"
+features[variable][] = "comment_anonymous_event"
+features[variable][] = "comment_controls_event"
+features[variable][] = "comment_default_mode_event"
+features[variable][] = "comment_default_order_event"
+features[variable][] = "comment_default_per_page_event"
+features[variable][] = "comment_event"
+features[variable][] = "comment_form_location_event"
+features[variable][] = "comment_preview_event"
+features[variable][] = "comment_subject_field_event"
+features[variable][] = "node_options_event"
 features[variable][] = "signup_admin_list_view"
 features[variable][] = "signup_date_field_event"
 features[variable][] = "signup_node_default_state_event"
-features[variable][] = "uc_product_shippable_event"
 name = "COD Events"
 package = "Features"
 project = "cod_events"
-version = "6.x-1.0-alpha1"
+version = "6.x-1.0-alpha2"
Index: cod_events/cod_events.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_events/cod_events.install,v
retrieving revision 1.3
diff -u -p -r1.3 cod_events.install
--- cod_events/cod_events.install	19 Oct 2010 18:44:10 -0000	1.3
+++ cod_events/cod_events.install	20 Oct 2010 15:14:39 -0000
@@ -1,30 +1 @@
 <?php
-/*
- * Implementation of hook_enable().
- */
-function cod_events_enable() {
-  cod_events_setup();
-}
-
-/*
- * Create a signup-enabled Event content type and product class.
- */
-function cod_events_setup() {
-  watchdog('cod_events', t('Performing COD Events setup.'));
-  // Create an event content type.
-  module_load_include('admin.inc', 'uc_product');
-  $form_state['values']['pcid'] = 'event';
-  $form_state['values']['name'] = 'Event';
-  $form_state['values']['description'] = 'Provides free and paid event registration on the Event content type.';
-  global $user;
-  $temp_user = $user;
-  session_save_session(FALSE);
-  $user = user_load(1);
-  drupal_execute('uc_product_class_form', $form_state);
-  $user = $temp_user;
-  session_save_session(TRUE);
-  // Rebuild features so that the event content type has the date field added.
-  features_rebuild(array('cod_events' => array('content')));
-  watchdog('cod_events', t('Finished COD Events setup.'));
-  drupal_set_message(t('Finished COD events setup.'));
-}
\ No newline at end of file
Index: cod_events/cod_events.strongarm.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_events/cod_events.strongarm.inc,v
retrieving revision 1.1
diff -u -p -r1.1 cod_events.strongarm.inc
--- cod_events/cod_events.strongarm.inc	19 Oct 2010 18:44:10 -0000	1.1
+++ cod_events/cod_events.strongarm.inc	20 Oct 2010 15:14:39 -0000
@@ -8,6 +8,79 @@ function cod_events_strongarm() {
   $strongarm = new stdClass;
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'comment_anonymous_event';
+  $strongarm->value = 0;
+
+  $export['comment_anonymous_event'] = $strongarm;
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_controls_event';
+  $strongarm->value = '3';
+
+  $export['comment_controls_event'] = $strongarm;
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_default_mode_event';
+  $strongarm->value = '4';
+
+  $export['comment_default_mode_event'] = $strongarm;
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_default_order_event';
+  $strongarm->value = '1';
+
+  $export['comment_default_order_event'] = $strongarm;
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_default_per_page_event';
+  $strongarm->value = '50';
+
+  $export['comment_default_per_page_event'] = $strongarm;
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_event';
+  $strongarm->value = '0';
+
+  $export['comment_event'] = $strongarm;
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_form_location_event';
+  $strongarm->value = '0';
+
+  $export['comment_form_location_event'] = $strongarm;
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_preview_event';
+  $strongarm->value = '1';
+
+  $export['comment_preview_event'] = $strongarm;
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'comment_subject_field_event';
+  $strongarm->value = '1';
+
+  $export['comment_subject_field_event'] = $strongarm;
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_options_event';
+  $strongarm->value = array(
+    0 => 'status',
+    1 => 'promote',
+  );
+
+  $export['node_options_event'] = $strongarm;
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'signup_admin_list_view';
   $strongarm->value = 'uc_signup_user_admin_list';
 
@@ -26,12 +99,5 @@ function cod_events_strongarm() {
   $strongarm->value = 'enabled_on';
 
   $export['signup_node_default_state_event'] = $strongarm;
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'uc_product_shippable_event';
-  $strongarm->value = 0;
-
-  $export['uc_product_shippable_event'] = $strongarm;
   return $export;
 }