From da973c88d81635163b681c274686f83d6984f819 Mon Sep 17 00:00:00 2001
From: kpaxman <kpaxman@fa002234-8a34-4095-91d7-71f00f8cef05>
Date: Fri, 3 May 2013 15:26:39 +0000
Subject: [PATCH] Create 1.22.1 from trunk

---
 uw_ct_event.features.inc                 | 105 -----------------------
 uw_ct_event.features.user_permission.inc |  11 +++
 uw_ct_event.info                         |  20 ++++-
 3 files changed, 29 insertions(+), 107 deletions(-)

diff --git a/uw_ct_event.features.inc b/uw_ct_event.features.inc
index 21fcc56..72f86fd 100644
--- a/uw_ct_event.features.inc
+++ b/uw_ct_event.features.inc
@@ -45,108 +45,3 @@ function uw_ct_event_node_info() {
   );
   return $items;
 }
-
-/**
- * Implements hook_rdf_default_mappings().
- */
-function uw_ct_event_rdf_default_mappings() {
-  $schemaorg = array();
-
-  // Exported RDF mapping: uw_event
-  $schemaorg['node']['uw_event'] = array(
-    'rdftype' => array(
-      0 => 'schema:Event',
-      1 => 'sioc:Item',
-      2 => 'foaf:Document',
-    ),
-    'title' => array(
-      'predicates' => array(
-        0 => 'schema:name',
-        1 => 'dc:title',
-      ),
-    ),
-    'created' => array(
-      'predicates' => array(
-        0 => 'dc:date',
-        1 => 'dc:created',
-      ),
-      'datatype' => 'xsd:dateTime',
-      'callback' => 'date_iso8601',
-    ),
-    'changed' => array(
-      'predicates' => array(
-        0 => 'dc:modified',
-      ),
-      'datatype' => 'xsd:dateTime',
-      'callback' => 'date_iso8601',
-    ),
-    'body' => array(
-      'predicates' => array(
-        0 => 'schema:description',
-        1 => 'schema:summary',
-        2 => 'content:encoded',
-      ),
-    ),
-    'uid' => array(
-      'predicates' => array(
-        0 => 'sioc:has_creator',
-      ),
-      'type' => 'rel',
-    ),
-    'name' => array(
-      'predicates' => array(
-        0 => 'foaf:name',
-      ),
-    ),
-    'comment_count' => array(
-      'predicates' => array(
-        0 => 'sioc:num_replies',
-      ),
-      'datatype' => 'xsd:integer',
-    ),
-    'last_activity' => array(
-      'predicates' => array(
-        0 => 'sioc:last_activity_date',
-      ),
-      'datatype' => 'xsd:dateTime',
-      'callback' => 'date_iso8601',
-    ),
-    'field_event_location' => array(
-      'predicates' => array(
-        0 => 'schema:location',
-      ),
-    ),
-    'field_event_date' => array(
-      'predicates' => array(
-        0 => 'schema:startDate',
-      ),
-    ),
-    'field_event_moreinfo_link' => array(
-      'predicates' => array(),
-    ),
-    'field_event_map_link' => array(
-      'predicates' => array(),
-    ),
-    'field_event_host_link' => array(
-      'predicates' => array(),
-    ),
-    'field_image' => array(
-      'predicates' => array(),
-      'type' => 'rel',
-    ),
-    'field_file' => array(
-      'predicates' => array(),
-      'type' => 'rel',
-    ),
-    'field_event_photo' => array(
-      'predicates' => array(),
-      'type' => 'rel',
-    ),
-    'field_event_image' => array(
-      'predicates' => array(),
-      'type' => 'rel',
-    ),
-  );
-
-  return $schemaorg;
-}
diff --git a/uw_ct_event.features.user_permission.inc b/uw_ct_event.features.user_permission.inc
index 882baef..5a01909 100644
--- a/uw_ct_event.features.user_permission.inc
+++ b/uw_ct_event.features.user_permission.inc
@@ -14,6 +14,7 @@ function uw_ct_event_user_default_permissions() {
   $permissions['create uw_event content'] = array(
     'name' => 'create uw_event content',
     'roles' => array(
+      'WCMS support' => 'WCMS support',
       'administrator' => 'administrator',
       'content author' => 'content author',
       'content editor' => 'content editor',
@@ -26,6 +27,7 @@ function uw_ct_event_user_default_permissions() {
   $permissions['delete any uw_event content'] = array(
     'name' => 'delete any uw_event content',
     'roles' => array(
+      'WCMS support' => 'WCMS support',
       'administrator' => 'administrator',
       'site manager' => 'site manager',
     ),
@@ -36,6 +38,7 @@ function uw_ct_event_user_default_permissions() {
   $permissions['delete own uw_event content'] = array(
     'name' => 'delete own uw_event content',
     'roles' => array(
+      'WCMS support' => 'WCMS support',
       'administrator' => 'administrator',
       'site manager' => 'site manager',
     ),
@@ -46,6 +49,7 @@ function uw_ct_event_user_default_permissions() {
   $permissions['edit any uw_event content'] = array(
     'name' => 'edit any uw_event content',
     'roles' => array(
+      'WCMS support' => 'WCMS support',
       'administrator' => 'administrator',
       'content author' => 'content author',
       'content editor' => 'content editor',
@@ -58,6 +62,7 @@ function uw_ct_event_user_default_permissions() {
   $permissions['edit own uw_event content'] = array(
     'name' => 'edit own uw_event content',
     'roles' => array(
+      'WCMS support' => 'WCMS support',
       'administrator' => 'administrator',
       'content author' => 'content author',
       'content editor' => 'content editor',
@@ -70,6 +75,7 @@ function uw_ct_event_user_default_permissions() {
   $permissions['enter uw_event revision log entry'] = array(
     'name' => 'enter uw_event revision log entry',
     'roles' => array(
+      'WCMS support' => 'WCMS support',
       'administrator' => 'administrator',
       'content author' => 'content author',
       'content editor' => 'content editor',
@@ -82,6 +88,7 @@ function uw_ct_event_user_default_permissions() {
   $permissions['override uw_event promote to front page option'] = array(
     'name' => 'override uw_event promote to front page option',
     'roles' => array(
+      'WCMS support' => 'WCMS support',
       'administrator' => 'administrator',
       'content author' => 'content author',
       'content editor' => 'content editor',
@@ -94,6 +101,7 @@ function uw_ct_event_user_default_permissions() {
   $permissions['override uw_event published option'] = array(
     'name' => 'override uw_event published option',
     'roles' => array(
+      'WCMS support' => 'WCMS support',
       'administrator' => 'administrator',
       'content author' => 'content author',
       'content editor' => 'content editor',
@@ -106,6 +114,7 @@ function uw_ct_event_user_default_permissions() {
   $permissions['override uw_event revision option'] = array(
     'name' => 'override uw_event revision option',
     'roles' => array(
+      'WCMS support' => 'WCMS support',
       'administrator' => 'administrator',
       'content author' => 'content author',
       'content editor' => 'content editor',
@@ -118,6 +127,7 @@ function uw_ct_event_user_default_permissions() {
   $permissions['override uw_event sticky option'] = array(
     'name' => 'override uw_event sticky option',
     'roles' => array(
+      'WCMS support' => 'WCMS support',
       'administrator' => 'administrator',
       'content author' => 'content author',
       'content editor' => 'content editor',
@@ -130,6 +140,7 @@ function uw_ct_event_user_default_permissions() {
   $permissions['submit latitude/longitude'] = array(
     'name' => 'submit latitude/longitude',
     'roles' => array(
+      'WCMS support' => 'WCMS support',
       'administrator' => 'administrator',
       'content author' => 'content author',
       'content editor' => 'content editor',
diff --git a/uw_ct_event.info b/uw_ct_event.info
index 302162c..a24e903 100644
--- a/uw_ct_event.info
+++ b/uw_ct_event.info
@@ -3,11 +3,12 @@ description = Adds events and event listing pages.
 core = 7.x
 package = uWaterloo Content Types
 php = 5.2.4
-version = 7.x-1.22
+version = 7.x-1.22.1
 project = uw_ct_event
 dependencies[] = better_formats
 dependencies[] = calendar
 dependencies[] = context
+dependencies[] = ctools
 dependencies[] = date
 dependencies[] = date_all_day
 dependencies[] = date_api
@@ -18,14 +19,19 @@ dependencies[] = date_repeat_field
 dependencies[] = date_views
 dependencies[] = features
 dependencies[] = field_group
+dependencies[] = file
 dependencies[] = image
 dependencies[] = link
+dependencies[] = location
 dependencies[] = location_cck
+dependencies[] = node
 dependencies[] = override_node_options
 dependencies[] = schemaorg
 dependencies[] = strongarm
 dependencies[] = term_reference_tree
+dependencies[] = text
 dependencies[] = uw_ct_blog
+dependencies[] = uw_ct_person_profile
 dependencies[] = uw_gmap_config
 dependencies[] = uw_roles_fdsu
 dependencies[] = uw_vocab_audience
@@ -62,7 +68,6 @@ features[field_instance][] = node-uw_event-field_event_moreinfo_link
 features[field_instance][] = node-uw_event-field_file
 features[field_instance][] = node-uw_event-field_image
 features[node][] = uw_event
-features[schemaorg][] = node-uw_event
 features[user_permission][] = create uw_event content
 features[user_permission][] = delete any uw_event content
 features[user_permission][] = delete own uw_event content
@@ -101,3 +106,14 @@ features[views_view][] = event_category_blocks
 features[views_view][] = events
 features[views_view][] = manage_events
 features[views_view][] = uw_ct_event_calendar
+features_exclude[field][node-uw_event-body] = node-uw_event-body
+features_exclude[field][node-uw_event-field_audience] = node-uw_event-field_audience
+features_exclude[field][node-uw_event-field_event_cost] = node-uw_event-field_event_cost
+features_exclude[field][node-uw_event-field_event_date] = node-uw_event-field_event_date
+features_exclude[field][node-uw_event-field_event_host_link] = node-uw_event-field_event_host_link
+features_exclude[field][node-uw_event-field_event_image] = node-uw_event-field_event_image
+features_exclude[field][node-uw_event-field_event_location] = node-uw_event-field_event_location
+features_exclude[field][node-uw_event-field_event_map_link] = node-uw_event-field_event_map_link
+features_exclude[field][node-uw_event-field_event_moreinfo_link] = node-uw_event-field_event_moreinfo_link
+features_exclude[field][node-uw_event-field_file] = node-uw_event-field_file
+features_exclude[field][node-uw_event-field_image] = node-uw_event-field_image
-- 
GitLab