From ce0078d0eab8a0a4346e2086069093351d37a604 Mon Sep 17 00:00:00 2001
From: Ben Woodhead <bwoodhead@upei.ca>
Date: Wed, 19 Oct 2011 09:33:17 -0300
Subject: [PATCH 1/6] Moved fixed a more appropriate place API should be low
 level fedora communications Core should be islandora specific code

---
 BatchIngest.inc => core/BatchIngest.inc                           | 0
 CollectionClass.inc => core/CollectionClass.inc                   | 0
 CollectionManagement.inc => core/CollectionManagement.inc         | 0
 CollectionPolicy.inc => core/CollectionPolicy.inc                 | 0
 ConnectionHelper.inc => core/ConnectionHelper.inc                 | 0
 ContentModel.inc => core/ContentModel.inc                         | 0
 MimeClass.inc => core/MimeClass.inc                               | 0
 ObjectHelper.inc => core/ObjectHelper.inc                         | 0
 SearchClass.inc => core/SearchClass.inc                           | 0
 SecurityClass.inc => core/SecurityClass.inc                       | 0
 XMLDatastream.inc => core/XMLDatastream.inc                       | 0
 .../fedora_repository.solutionpacks.inc                           | 0
 formClass.inc => core/formClass.inc                               | 0
 islandoracm.xsd => xsd/islandoracm.xsd                            | 0
 searchTerms.xml => xsl/searchTerms.xml                            | 0
 solrSearchTerms.xml => xsl/solrSearchTerms.xml                    | 0
 16 files changed, 0 insertions(+), 0 deletions(-)
 rename BatchIngest.inc => core/BatchIngest.inc (100%)
 rename CollectionClass.inc => core/CollectionClass.inc (100%)
 rename CollectionManagement.inc => core/CollectionManagement.inc (100%)
 rename CollectionPolicy.inc => core/CollectionPolicy.inc (100%)
 rename ConnectionHelper.inc => core/ConnectionHelper.inc (100%)
 rename ContentModel.inc => core/ContentModel.inc (100%)
 rename MimeClass.inc => core/MimeClass.inc (100%)
 rename ObjectHelper.inc => core/ObjectHelper.inc (100%)
 rename SearchClass.inc => core/SearchClass.inc (100%)
 rename SecurityClass.inc => core/SecurityClass.inc (100%)
 rename XMLDatastream.inc => core/XMLDatastream.inc (100%)
 rename fedora_repository.solutionpacks.inc => core/fedora_repository.solutionpacks.inc (100%)
 rename formClass.inc => core/formClass.inc (100%)
 rename islandoracm.xsd => xsd/islandoracm.xsd (100%)
 rename searchTerms.xml => xsl/searchTerms.xml (100%)
 rename solrSearchTerms.xml => xsl/solrSearchTerms.xml (100%)

diff --git a/BatchIngest.inc b/core/BatchIngest.inc
similarity index 100%
rename from BatchIngest.inc
rename to core/BatchIngest.inc
diff --git a/CollectionClass.inc b/core/CollectionClass.inc
similarity index 100%
rename from CollectionClass.inc
rename to core/CollectionClass.inc
diff --git a/CollectionManagement.inc b/core/CollectionManagement.inc
similarity index 100%
rename from CollectionManagement.inc
rename to core/CollectionManagement.inc
diff --git a/CollectionPolicy.inc b/core/CollectionPolicy.inc
similarity index 100%
rename from CollectionPolicy.inc
rename to core/CollectionPolicy.inc
diff --git a/ConnectionHelper.inc b/core/ConnectionHelper.inc
similarity index 100%
rename from ConnectionHelper.inc
rename to core/ConnectionHelper.inc
diff --git a/ContentModel.inc b/core/ContentModel.inc
similarity index 100%
rename from ContentModel.inc
rename to core/ContentModel.inc
diff --git a/MimeClass.inc b/core/MimeClass.inc
similarity index 100%
rename from MimeClass.inc
rename to core/MimeClass.inc
diff --git a/ObjectHelper.inc b/core/ObjectHelper.inc
similarity index 100%
rename from ObjectHelper.inc
rename to core/ObjectHelper.inc
diff --git a/SearchClass.inc b/core/SearchClass.inc
similarity index 100%
rename from SearchClass.inc
rename to core/SearchClass.inc
diff --git a/SecurityClass.inc b/core/SecurityClass.inc
similarity index 100%
rename from SecurityClass.inc
rename to core/SecurityClass.inc
diff --git a/XMLDatastream.inc b/core/XMLDatastream.inc
similarity index 100%
rename from XMLDatastream.inc
rename to core/XMLDatastream.inc
diff --git a/fedora_repository.solutionpacks.inc b/core/fedora_repository.solutionpacks.inc
similarity index 100%
rename from fedora_repository.solutionpacks.inc
rename to core/fedora_repository.solutionpacks.inc
diff --git a/formClass.inc b/core/formClass.inc
similarity index 100%
rename from formClass.inc
rename to core/formClass.inc
diff --git a/islandoracm.xsd b/xsd/islandoracm.xsd
similarity index 100%
rename from islandoracm.xsd
rename to xsd/islandoracm.xsd
diff --git a/searchTerms.xml b/xsl/searchTerms.xml
similarity index 100%
rename from searchTerms.xml
rename to xsl/searchTerms.xml
diff --git a/solrSearchTerms.xml b/xsl/solrSearchTerms.xml
similarity index 100%
rename from solrSearchTerms.xml
rename to xsl/solrSearchTerms.xml

From bddfd81fc8c1082e0bf76b789727790a7dde92d8 Mon Sep 17 00:00:00 2001
From: Ben Woodhead <bwoodhead@upei.ca>
Date: Wed, 19 Oct 2011 09:57:41 -0300
Subject: [PATCH 2/6] Marked everything in plugins as deprecated

---
 {plugins => api}/fedora_imageapi.info   |  0
 {plugins => api}/fedora_imageapi.module |  6 ++++--
 plugins/CollectionFormBuilder.inc       |  4 +---
 plugins/CreateCollection.inc            |  1 +
 plugins/DarwinCore.inc                  |  9 ++-------
 plugins/DemoFormBuilder.inc             |  4 +---
 plugins/DocumentConverter.inc           |  2 +-
 plugins/Exiftool.inc                    |  3 +--
 plugins/FedoraObjectDetailedContent.inc |  3 +--
 plugins/Ffmpeg.inc                      |  3 +--
 plugins/Flv.inc                         |  3 +--
 plugins/FlvFormBuilder.inc              |  4 +---
 plugins/FormBuilder.inc                 |  3 +--
 plugins/ImageManipulation.inc           |  3 +--
 plugins/ModsFormBuilder.inc             |  5 ++---
 plugins/PersonalCollectionClass.inc     |  3 +--
 plugins/QtFormBuilder.php               |  3 +--
 plugins/Refworks.inc                    |  3 ++-
 plugins/ShowDemoStreamsInFieldSets.inc  |  3 ++-
 plugins/ShowStreamsInFieldSets.inc      |  3 ++-
 plugins/herbarium.inc                   | 12 ++++++------
 plugins/map_viewer.inc                  |  5 ++---
 plugins/qt_viewer.inc                   |  3 +--
 plugins/slide_viewer.inc                |  5 ++---
 plugins/tagging_form.inc                |  6 ++++--
 25 files changed, 42 insertions(+), 57 deletions(-)
 rename {plugins => api}/fedora_imageapi.info (100%)
 rename {plugins => api}/fedora_imageapi.module (98%)

diff --git a/plugins/fedora_imageapi.info b/api/fedora_imageapi.info
similarity index 100%
rename from plugins/fedora_imageapi.info
rename to api/fedora_imageapi.info
diff --git a/plugins/fedora_imageapi.module b/api/fedora_imageapi.module
similarity index 98%
rename from plugins/fedora_imageapi.module
rename to api/fedora_imageapi.module
index f3bd4481..99c2cfd2 100644
--- a/plugins/fedora_imageapi.module
+++ b/api/fedora_imageapi.module
@@ -1,7 +1,9 @@
 <?php
 
-
-
+/**
+ * fedora imageapi menu 
+ * @return string 
+ */
 function fedora_imageapi_menu() {
   $items = array();
   $items['fedora/imageapi'] = array(
diff --git a/plugins/CollectionFormBuilder.inc b/plugins/CollectionFormBuilder.inc
index 93e11479..83624d38 100644
--- a/plugins/CollectionFormBuilder.inc
+++ b/plugins/CollectionFormBuilder.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * Collection Form Builder
@@ -12,8 +10,8 @@ module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 /**
  * implements methods from content model ingest form xml
  * builds a dc metadata form
+ * @deprecated
  */
-
 class CollectionFormBuilder extends FormBuilder {
 
   /**
diff --git a/plugins/CreateCollection.inc b/plugins/CreateCollection.inc
index c02ac2b7..c29eb657 100644
--- a/plugins/CreateCollection.inc
+++ b/plugins/CreateCollection.inc
@@ -9,6 +9,7 @@
 
 /**
  * This Class implements the methods defined in the STANDARD_IMAGE content model
+ * @deprecated
  */
 class CreateCollection {
 
diff --git a/plugins/DarwinCore.inc b/plugins/DarwinCore.inc
index 2d66d60a..dc698521 100644
--- a/plugins/DarwinCore.inc
+++ b/plugins/DarwinCore.inc
@@ -1,18 +1,13 @@
 <?php
 
-/* @file
-
-
-
-*/
-
 /**
  * @file
  * Darwin Core class
  */
 
 /**
- * Darwin Core ???
+ * Darwin Core
+ * @deprecated
  */
 class DarwinCore {
 
diff --git a/plugins/DemoFormBuilder.inc b/plugins/DemoFormBuilder.inc
index 05a9304f..305c2029 100644
--- a/plugins/DemoFormBuilder.inc
+++ b/plugins/DemoFormBuilder.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * 
@@ -11,8 +9,8 @@ module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 /**
  * implements methods from content model ingest form xml
  * builds a dc metadata form
+ * @deprecated
  */
-
 class DemoFormBuilder extends FormBuilder {
 
   /**
diff --git a/plugins/DocumentConverter.inc b/plugins/DocumentConverter.inc
index f258441a..ce782f08 100644
--- a/plugins/DocumentConverter.inc
+++ b/plugins/DocumentConverter.inc
@@ -1,6 +1,5 @@
 <?php
 
-
 /**
  * @file
  * Document Converter Class
@@ -9,6 +8,7 @@
 /**
  * This class implements document (doc, odt, pdf, etc.) conversion for a generic
  * multi-format document collection.
+ * @deprecated
  */
 class DocumentConverter {
 
diff --git a/plugins/Exiftool.inc b/plugins/Exiftool.inc
index d8fd5e90..002c6b0c 100644
--- a/plugins/Exiftool.inc
+++ b/plugins/Exiftool.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * Exiftool
@@ -9,6 +7,7 @@
 
 /**
  * This Class implements the methods defined in the STANDARD_IMAGE content model
+ * @deprecated
  */
 class Exiftool {
 
diff --git a/plugins/FedoraObjectDetailedContent.inc b/plugins/FedoraObjectDetailedContent.inc
index 4f3d9a74..ea70642b 100644
--- a/plugins/FedoraObjectDetailedContent.inc
+++ b/plugins/FedoraObjectDetailedContent.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * FedoraObjectDetailedContent class
@@ -11,6 +9,7 @@
  * Fedora Object. This class is a plugin called from content models to display a detailed list of 
  * content of the Fedora Item. This is hard coded into Islandora core, and it can also be called
  * from the IslandoraCM stream.
+ * @deprecated
  */
 class FedoraObjectDetailedContent {
 
diff --git a/plugins/Ffmpeg.inc b/plugins/Ffmpeg.inc
index 46b4ae80..7c2159ed 100644
--- a/plugins/Ffmpeg.inc
+++ b/plugins/Ffmpeg.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * Ffmpeg wrapper class
@@ -11,6 +9,7 @@
  * FFMpeg wrapper class for generating movie thumbnails
  * 
  * This Class implements the methods defined in the STANDARD_QT content model
+ * @deprecated
  */
 class Ffmpeg {
 
diff --git a/plugins/Flv.inc b/plugins/Flv.inc
index b5f159b2..76506ce3 100644
--- a/plugins/Flv.inc
+++ b/plugins/Flv.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * Form Builder class
@@ -9,6 +7,7 @@
 
 /**
  * implements method from content model ingest form xml
+ * @deprecated
  */
 class FormBuilder {
 
diff --git a/plugins/FlvFormBuilder.inc b/plugins/FlvFormBuilder.inc
index 8c2b5777..5e022b88 100644
--- a/plugins/FlvFormBuilder.inc
+++ b/plugins/FlvFormBuilder.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * FLVFormBuilder
@@ -11,8 +9,8 @@ module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 /**
  * implements methods from content model ingest form xml
  * builds a dc metadata form
+ * @deprecated
  */
-
 class FlvFormBuilder extends FormBuilder {
 
   /**
diff --git a/plugins/FormBuilder.inc b/plugins/FormBuilder.inc
index cd9dc4a9..02ca6ace 100644
--- a/plugins/FormBuilder.inc
+++ b/plugins/FormBuilder.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * FormBuilder class
@@ -10,6 +8,7 @@
 /**
  * implements methods from content model ingest form xml
  * builds a dc metadata form
+ * @deprecated
  */
 class FormBuilder {
 
diff --git a/plugins/ImageManipulation.inc b/plugins/ImageManipulation.inc
index 4faabdd8..bbbe84fd 100644
--- a/plugins/ImageManipulation.inc
+++ b/plugins/ImageManipulation.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * Image Manipulation class
@@ -9,6 +7,7 @@
 
 /**
  * This Class implements the methods defined in the STANDARD_IMAGE content model
+ * @deprecated
  */
 class ImageManipulation {
 
diff --git a/plugins/ModsFormBuilder.inc b/plugins/ModsFormBuilder.inc
index aa0f6f92..c7eefdb6 100644
--- a/plugins/ModsFormBuilder.inc
+++ b/plugins/ModsFormBuilder.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * ModsFormBuilder class
@@ -9,7 +7,8 @@
 module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 
 /**
- * ModsFormBuilder class ???
+ * ModsFormBuilder class
+ * @deprecated
  */
 class ModsFormBuilder extends FormBuilder {
 
diff --git a/plugins/PersonalCollectionClass.inc b/plugins/PersonalCollectionClass.inc
index 29c76cfa..b81d75df 100644
--- a/plugins/PersonalCollectionClass.inc
+++ b/plugins/PersonalCollectionClass.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * PersonalCollectionClass class
@@ -9,6 +7,7 @@
 
 /**
  * Personal Collection Class
+ * @deprecated
  */
 class PersonalCollectionClass {
 
diff --git a/plugins/QtFormBuilder.php b/plugins/QtFormBuilder.php
index 28645d6b..95b7699c 100644
--- a/plugins/QtFormBuilder.php
+++ b/plugins/QtFormBuilder.php
@@ -1,7 +1,5 @@
 <?php
 
-// $Id$
-
 /**
  * @file
  * QTFormBuilder class
@@ -11,6 +9,7 @@ module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 /**
  * Implements methods from content model ingest form xml
  *  builds a dc metadata form
+ * @deprecated
  */
 class QtFormBuilder extends FormBuilder {
 
diff --git a/plugins/Refworks.inc b/plugins/Refworks.inc
index 5e39b3c2..e539520c 100644
--- a/plugins/Refworks.inc
+++ b/plugins/Refworks.inc
@@ -10,7 +10,8 @@
 module_load_include('inc', 'fedora_repository', 'SecurityClass');
 
 /**
- * Refworks class ???
+ * Refworks class
+ * @deprecated
  */
 class Refworks {
 
diff --git a/plugins/ShowDemoStreamsInFieldSets.inc b/plugins/ShowDemoStreamsInFieldSets.inc
index 80f8017c..05c2dbd8 100644
--- a/plugins/ShowDemoStreamsInFieldSets.inc
+++ b/plugins/ShowDemoStreamsInFieldSets.inc
@@ -8,7 +8,8 @@
  */
 
 /**
- * Show Demo Streams in Field Sets ???
+ * Show Demo Streams in Field Sets
+ * @deprecated
  */
 class ShowDemoStreamsInFieldSets {
 
diff --git a/plugins/ShowStreamsInFieldSets.inc b/plugins/ShowStreamsInFieldSets.inc
index a6e7eaad..3fc116d2 100644
--- a/plugins/ShowStreamsInFieldSets.inc
+++ b/plugins/ShowStreamsInFieldSets.inc
@@ -8,7 +8,8 @@
  */
 
 /**
- * Show Streams In Field Sets ??
+ * Show Streams In Field Sets
+ * @deprecated
  */
 class ShowStreamsInFieldSets {
 
diff --git a/plugins/herbarium.inc b/plugins/herbarium.inc
index f7a6d685..fa2ac4a7 100644
--- a/plugins/herbarium.inc
+++ b/plugins/herbarium.inc
@@ -1,20 +1,20 @@
 <?php
 
-/**
- * @file 
- * 
- */
-
 /**
  * @file
  * Herbarium class
  */
 
 /**
- * Herbarium ???
+ * Herbarium Class
+ * @deprecated
  */
 class Herbarium {
 
+  /**
+   * Constructor
+   * @param type $pid 
+   */
   function __construct($pid = '') {
     module_load_include('inc', 'fedora_repository', 'api/fedora_item');
     if (!empty($pid)) {
diff --git a/plugins/map_viewer.inc b/plugins/map_viewer.inc
index f3bfca80..7b9cdf1d 100644
--- a/plugins/map_viewer.inc
+++ b/plugins/map_viewer.inc
@@ -1,14 +1,13 @@
 <?php
 
-
-
 /**
  * @file
  * ShowMapStreamsInFieldSets class
  */
 
 /**
- * Show Map Streams in Field Sets Class ??
+ * Show Map Streams in Field Sets Class
+ * @deprecated
  */
 class ShowMapStreamsInFieldSets {
 
diff --git a/plugins/qt_viewer.inc b/plugins/qt_viewer.inc
index e52e4363..46984cf2 100644
--- a/plugins/qt_viewer.inc
+++ b/plugins/qt_viewer.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * ShowQTStreamsInFieldSets class
@@ -9,6 +7,7 @@
 
 /**
  * Show QT Stream in Field Sets
+ * @deprecated
  */
 class ShowQtStreamsInFieldSets {
 
diff --git a/plugins/slide_viewer.inc b/plugins/slide_viewer.inc
index 45ff3f9d..b7c3cf41 100644
--- a/plugins/slide_viewer.inc
+++ b/plugins/slide_viewer.inc
@@ -1,14 +1,13 @@
 <?php
 
-
-
 /**
  * @file
  * ShowSlideStreamsInFieldSets class
  */
 
 /**
- * ShowSlideStreamInFieldSets ??????
+ * ShowSlideStreamInFieldSets
+ * @deprecated
  */
 class ShowSlideStreamsInFieldSets {
 
diff --git a/plugins/tagging_form.inc b/plugins/tagging_form.inc
index 390bf36c..d3931957 100644
--- a/plugins/tagging_form.inc
+++ b/plugins/tagging_form.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * Tagging Form???
@@ -11,6 +9,7 @@
  * Show subject tags ???
  * @param type $pid
  * @return string 
+ * @deprecated
  */
 function _show_subject_tags($pid) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');
@@ -34,6 +33,7 @@ function _show_subject_tags($pid) {
  * @param type $form_state
  * @param type $pid
  * @return type 
+ * @deprecated
  */
 function fedora_repository_image_tagging_form($form_state, $pid) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');
@@ -105,6 +105,7 @@ function fedora_repository_image_tagging_form($form_state, $pid) {
  * Hook image button process ???
  * @param type $form
  * @return string 
+ * @deprecated
  */
 function hook_imagebutton_process($form) {
   $form['op_x'] = array(
@@ -121,6 +122,7 @@ function hook_imagebutton_process($form) {
  * @global type $user
  * @param type $form
  * @param type $form_state 
+ * @deprecated
  */
 function fedora_repository_image_tagging_form_submit($form, &$form_state) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');

From 4bca2e80afa15eaec7805611218d968c72e6b307 Mon Sep 17 00:00:00 2001
From: Ben Woodhead <bwoodhead@upei.ca>
Date: Wed, 19 Oct 2011 09:58:39 -0300
Subject: [PATCH 3/6] Moved the collection policy file

---
 collection_policy.xsd => xsd/collection_policy.xsd | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename collection_policy.xsd => xsd/collection_policy.xsd (100%)

diff --git a/collection_policy.xsd b/xsd/collection_policy.xsd
similarity index 100%
rename from collection_policy.xsd
rename to xsd/collection_policy.xsd

From d037ce4edf5597951bfa7d5c6c14765b69de2c91 Mon Sep 17 00:00:00 2001
From: Ben Woodhead <bwoodhead@upei.ca>
Date: Wed, 19 Oct 2011 10:07:47 -0300
Subject: [PATCH 4/6] Revert "Moved the collection policy file"

This reverts commit 4bca2e80afa15eaec7805611218d968c72e6b307.
---
 xsd/collection_policy.xsd => collection_policy.xsd | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename xsd/collection_policy.xsd => collection_policy.xsd (100%)

diff --git a/xsd/collection_policy.xsd b/collection_policy.xsd
similarity index 100%
rename from xsd/collection_policy.xsd
rename to collection_policy.xsd

From e1ebfb8f32a7389c2fab76d03b27fcb77cb3865e Mon Sep 17 00:00:00 2001
From: Ben Woodhead <bwoodhead@upei.ca>
Date: Wed, 19 Oct 2011 10:07:56 -0300
Subject: [PATCH 5/6] Revert "Marked everything in plugins as deprecated"

This reverts commit bddfd81fc8c1082e0bf76b789727790a7dde92d8.
---
 plugins/CollectionFormBuilder.inc       |  4 +++-
 plugins/CreateCollection.inc            |  1 -
 plugins/DarwinCore.inc                  |  9 +++++++--
 plugins/DemoFormBuilder.inc             |  4 +++-
 plugins/DocumentConverter.inc           |  2 +-
 plugins/Exiftool.inc                    |  3 ++-
 plugins/FedoraObjectDetailedContent.inc |  3 ++-
 plugins/Ffmpeg.inc                      |  3 ++-
 plugins/Flv.inc                         |  3 ++-
 plugins/FlvFormBuilder.inc              |  4 +++-
 plugins/FormBuilder.inc                 |  3 ++-
 plugins/ImageManipulation.inc           |  3 ++-
 plugins/ModsFormBuilder.inc             |  5 +++--
 plugins/PersonalCollectionClass.inc     |  3 ++-
 plugins/QtFormBuilder.php               |  3 ++-
 plugins/Refworks.inc                    |  3 +--
 plugins/ShowDemoStreamsInFieldSets.inc  |  3 +--
 plugins/ShowStreamsInFieldSets.inc      |  3 +--
 {api => plugins}/fedora_imageapi.info   |  0
 {api => plugins}/fedora_imageapi.module |  6 ++----
 plugins/herbarium.inc                   | 12 ++++++------
 plugins/map_viewer.inc                  |  5 +++--
 plugins/qt_viewer.inc                   |  3 ++-
 plugins/slide_viewer.inc                |  5 +++--
 plugins/tagging_form.inc                |  6 ++----
 25 files changed, 57 insertions(+), 42 deletions(-)
 rename {api => plugins}/fedora_imageapi.info (100%)
 rename {api => plugins}/fedora_imageapi.module (98%)

diff --git a/plugins/CollectionFormBuilder.inc b/plugins/CollectionFormBuilder.inc
index 83624d38..93e11479 100644
--- a/plugins/CollectionFormBuilder.inc
+++ b/plugins/CollectionFormBuilder.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * Collection Form Builder
@@ -10,8 +12,8 @@ module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 /**
  * implements methods from content model ingest form xml
  * builds a dc metadata form
- * @deprecated
  */
+
 class CollectionFormBuilder extends FormBuilder {
 
   /**
diff --git a/plugins/CreateCollection.inc b/plugins/CreateCollection.inc
index c29eb657..c02ac2b7 100644
--- a/plugins/CreateCollection.inc
+++ b/plugins/CreateCollection.inc
@@ -9,7 +9,6 @@
 
 /**
  * This Class implements the methods defined in the STANDARD_IMAGE content model
- * @deprecated
  */
 class CreateCollection {
 
diff --git a/plugins/DarwinCore.inc b/plugins/DarwinCore.inc
index dc698521..2d66d60a 100644
--- a/plugins/DarwinCore.inc
+++ b/plugins/DarwinCore.inc
@@ -1,13 +1,18 @@
 <?php
 
+/* @file
+
+
+
+*/
+
 /**
  * @file
  * Darwin Core class
  */
 
 /**
- * Darwin Core
- * @deprecated
+ * Darwin Core ???
  */
 class DarwinCore {
 
diff --git a/plugins/DemoFormBuilder.inc b/plugins/DemoFormBuilder.inc
index 305c2029..05a9304f 100644
--- a/plugins/DemoFormBuilder.inc
+++ b/plugins/DemoFormBuilder.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * 
@@ -9,8 +11,8 @@ module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 /**
  * implements methods from content model ingest form xml
  * builds a dc metadata form
- * @deprecated
  */
+
 class DemoFormBuilder extends FormBuilder {
 
   /**
diff --git a/plugins/DocumentConverter.inc b/plugins/DocumentConverter.inc
index ce782f08..f258441a 100644
--- a/plugins/DocumentConverter.inc
+++ b/plugins/DocumentConverter.inc
@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  * @file
  * Document Converter Class
@@ -8,7 +9,6 @@
 /**
  * This class implements document (doc, odt, pdf, etc.) conversion for a generic
  * multi-format document collection.
- * @deprecated
  */
 class DocumentConverter {
 
diff --git a/plugins/Exiftool.inc b/plugins/Exiftool.inc
index 002c6b0c..d8fd5e90 100644
--- a/plugins/Exiftool.inc
+++ b/plugins/Exiftool.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * Exiftool
@@ -7,7 +9,6 @@
 
 /**
  * This Class implements the methods defined in the STANDARD_IMAGE content model
- * @deprecated
  */
 class Exiftool {
 
diff --git a/plugins/FedoraObjectDetailedContent.inc b/plugins/FedoraObjectDetailedContent.inc
index ea70642b..4f3d9a74 100644
--- a/plugins/FedoraObjectDetailedContent.inc
+++ b/plugins/FedoraObjectDetailedContent.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * FedoraObjectDetailedContent class
@@ -9,7 +11,6 @@
  * Fedora Object. This class is a plugin called from content models to display a detailed list of 
  * content of the Fedora Item. This is hard coded into Islandora core, and it can also be called
  * from the IslandoraCM stream.
- * @deprecated
  */
 class FedoraObjectDetailedContent {
 
diff --git a/plugins/Ffmpeg.inc b/plugins/Ffmpeg.inc
index 7c2159ed..46b4ae80 100644
--- a/plugins/Ffmpeg.inc
+++ b/plugins/Ffmpeg.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * Ffmpeg wrapper class
@@ -9,7 +11,6 @@
  * FFMpeg wrapper class for generating movie thumbnails
  * 
  * This Class implements the methods defined in the STANDARD_QT content model
- * @deprecated
  */
 class Ffmpeg {
 
diff --git a/plugins/Flv.inc b/plugins/Flv.inc
index 76506ce3..b5f159b2 100644
--- a/plugins/Flv.inc
+++ b/plugins/Flv.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * Form Builder class
@@ -7,7 +9,6 @@
 
 /**
  * implements method from content model ingest form xml
- * @deprecated
  */
 class FormBuilder {
 
diff --git a/plugins/FlvFormBuilder.inc b/plugins/FlvFormBuilder.inc
index 5e022b88..8c2b5777 100644
--- a/plugins/FlvFormBuilder.inc
+++ b/plugins/FlvFormBuilder.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * FLVFormBuilder
@@ -9,8 +11,8 @@ module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 /**
  * implements methods from content model ingest form xml
  * builds a dc metadata form
- * @deprecated
  */
+
 class FlvFormBuilder extends FormBuilder {
 
   /**
diff --git a/plugins/FormBuilder.inc b/plugins/FormBuilder.inc
index 02ca6ace..cd9dc4a9 100644
--- a/plugins/FormBuilder.inc
+++ b/plugins/FormBuilder.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * FormBuilder class
@@ -8,7 +10,6 @@
 /**
  * implements methods from content model ingest form xml
  * builds a dc metadata form
- * @deprecated
  */
 class FormBuilder {
 
diff --git a/plugins/ImageManipulation.inc b/plugins/ImageManipulation.inc
index bbbe84fd..4faabdd8 100644
--- a/plugins/ImageManipulation.inc
+++ b/plugins/ImageManipulation.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * Image Manipulation class
@@ -7,7 +9,6 @@
 
 /**
  * This Class implements the methods defined in the STANDARD_IMAGE content model
- * @deprecated
  */
 class ImageManipulation {
 
diff --git a/plugins/ModsFormBuilder.inc b/plugins/ModsFormBuilder.inc
index c7eefdb6..aa0f6f92 100644
--- a/plugins/ModsFormBuilder.inc
+++ b/plugins/ModsFormBuilder.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * ModsFormBuilder class
@@ -7,8 +9,7 @@
 module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 
 /**
- * ModsFormBuilder class
- * @deprecated
+ * ModsFormBuilder class ???
  */
 class ModsFormBuilder extends FormBuilder {
 
diff --git a/plugins/PersonalCollectionClass.inc b/plugins/PersonalCollectionClass.inc
index b81d75df..29c76cfa 100644
--- a/plugins/PersonalCollectionClass.inc
+++ b/plugins/PersonalCollectionClass.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * PersonalCollectionClass class
@@ -7,7 +9,6 @@
 
 /**
  * Personal Collection Class
- * @deprecated
  */
 class PersonalCollectionClass {
 
diff --git a/plugins/QtFormBuilder.php b/plugins/QtFormBuilder.php
index 95b7699c..28645d6b 100644
--- a/plugins/QtFormBuilder.php
+++ b/plugins/QtFormBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+// $Id$
+
 /**
  * @file
  * QTFormBuilder class
@@ -9,7 +11,6 @@ module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 /**
  * Implements methods from content model ingest form xml
  *  builds a dc metadata form
- * @deprecated
  */
 class QtFormBuilder extends FormBuilder {
 
diff --git a/plugins/Refworks.inc b/plugins/Refworks.inc
index e539520c..5e39b3c2 100644
--- a/plugins/Refworks.inc
+++ b/plugins/Refworks.inc
@@ -10,8 +10,7 @@
 module_load_include('inc', 'fedora_repository', 'SecurityClass');
 
 /**
- * Refworks class
- * @deprecated
+ * Refworks class ???
  */
 class Refworks {
 
diff --git a/plugins/ShowDemoStreamsInFieldSets.inc b/plugins/ShowDemoStreamsInFieldSets.inc
index 05c2dbd8..80f8017c 100644
--- a/plugins/ShowDemoStreamsInFieldSets.inc
+++ b/plugins/ShowDemoStreamsInFieldSets.inc
@@ -8,8 +8,7 @@
  */
 
 /**
- * Show Demo Streams in Field Sets
- * @deprecated
+ * Show Demo Streams in Field Sets ???
  */
 class ShowDemoStreamsInFieldSets {
 
diff --git a/plugins/ShowStreamsInFieldSets.inc b/plugins/ShowStreamsInFieldSets.inc
index 3fc116d2..a6e7eaad 100644
--- a/plugins/ShowStreamsInFieldSets.inc
+++ b/plugins/ShowStreamsInFieldSets.inc
@@ -8,8 +8,7 @@
  */
 
 /**
- * Show Streams In Field Sets
- * @deprecated
+ * Show Streams In Field Sets ??
  */
 class ShowStreamsInFieldSets {
 
diff --git a/api/fedora_imageapi.info b/plugins/fedora_imageapi.info
similarity index 100%
rename from api/fedora_imageapi.info
rename to plugins/fedora_imageapi.info
diff --git a/api/fedora_imageapi.module b/plugins/fedora_imageapi.module
similarity index 98%
rename from api/fedora_imageapi.module
rename to plugins/fedora_imageapi.module
index 99c2cfd2..f3bd4481 100644
--- a/api/fedora_imageapi.module
+++ b/plugins/fedora_imageapi.module
@@ -1,9 +1,7 @@
 <?php
 
-/**
- * fedora imageapi menu 
- * @return string 
- */
+
+
 function fedora_imageapi_menu() {
   $items = array();
   $items['fedora/imageapi'] = array(
diff --git a/plugins/herbarium.inc b/plugins/herbarium.inc
index fa2ac4a7..f7a6d685 100644
--- a/plugins/herbarium.inc
+++ b/plugins/herbarium.inc
@@ -1,20 +1,20 @@
 <?php
 
+/**
+ * @file 
+ * 
+ */
+
 /**
  * @file
  * Herbarium class
  */
 
 /**
- * Herbarium Class
- * @deprecated
+ * Herbarium ???
  */
 class Herbarium {
 
-  /**
-   * Constructor
-   * @param type $pid 
-   */
   function __construct($pid = '') {
     module_load_include('inc', 'fedora_repository', 'api/fedora_item');
     if (!empty($pid)) {
diff --git a/plugins/map_viewer.inc b/plugins/map_viewer.inc
index 7b9cdf1d..f3bfca80 100644
--- a/plugins/map_viewer.inc
+++ b/plugins/map_viewer.inc
@@ -1,13 +1,14 @@
 <?php
 
+
+
 /**
  * @file
  * ShowMapStreamsInFieldSets class
  */
 
 /**
- * Show Map Streams in Field Sets Class
- * @deprecated
+ * Show Map Streams in Field Sets Class ??
  */
 class ShowMapStreamsInFieldSets {
 
diff --git a/plugins/qt_viewer.inc b/plugins/qt_viewer.inc
index 46984cf2..e52e4363 100644
--- a/plugins/qt_viewer.inc
+++ b/plugins/qt_viewer.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * ShowQTStreamsInFieldSets class
@@ -7,7 +9,6 @@
 
 /**
  * Show QT Stream in Field Sets
- * @deprecated
  */
 class ShowQtStreamsInFieldSets {
 
diff --git a/plugins/slide_viewer.inc b/plugins/slide_viewer.inc
index b7c3cf41..45ff3f9d 100644
--- a/plugins/slide_viewer.inc
+++ b/plugins/slide_viewer.inc
@@ -1,13 +1,14 @@
 <?php
 
+
+
 /**
  * @file
  * ShowSlideStreamsInFieldSets class
  */
 
 /**
- * ShowSlideStreamInFieldSets
- * @deprecated
+ * ShowSlideStreamInFieldSets ??????
  */
 class ShowSlideStreamsInFieldSets {
 
diff --git a/plugins/tagging_form.inc b/plugins/tagging_form.inc
index d3931957..390bf36c 100644
--- a/plugins/tagging_form.inc
+++ b/plugins/tagging_form.inc
@@ -1,5 +1,7 @@
 <?php
 
+
+
 /**
  * @file
  * Tagging Form???
@@ -9,7 +11,6 @@
  * Show subject tags ???
  * @param type $pid
  * @return string 
- * @deprecated
  */
 function _show_subject_tags($pid) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');
@@ -33,7 +34,6 @@ function _show_subject_tags($pid) {
  * @param type $form_state
  * @param type $pid
  * @return type 
- * @deprecated
  */
 function fedora_repository_image_tagging_form($form_state, $pid) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');
@@ -105,7 +105,6 @@ function fedora_repository_image_tagging_form($form_state, $pid) {
  * Hook image button process ???
  * @param type $form
  * @return string 
- * @deprecated
  */
 function hook_imagebutton_process($form) {
   $form['op_x'] = array(
@@ -122,7 +121,6 @@ function hook_imagebutton_process($form) {
  * @global type $user
  * @param type $form
  * @param type $form_state 
- * @deprecated
  */
 function fedora_repository_image_tagging_form_submit($form, &$form_state) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');

From b79b82ab89097187dbc9b24bec4137e69dce9c9f Mon Sep 17 00:00:00 2001
From: Ben Woodhead <bwoodhead@upei.ca>
Date: Wed, 19 Oct 2011 10:08:02 -0300
Subject: [PATCH 6/6] Revert "Moved fixed a more appropriate place"

This reverts commit ce0078d0eab8a0a4346e2086069093351d37a604.
---
 core/BatchIngest.inc => BatchIngest.inc                           | 0
 core/CollectionClass.inc => CollectionClass.inc                   | 0
 core/CollectionManagement.inc => CollectionManagement.inc         | 0
 core/CollectionPolicy.inc => CollectionPolicy.inc                 | 0
 core/ConnectionHelper.inc => ConnectionHelper.inc                 | 0
 core/ContentModel.inc => ContentModel.inc                         | 0
 core/MimeClass.inc => MimeClass.inc                               | 0
 core/ObjectHelper.inc => ObjectHelper.inc                         | 0
 core/SearchClass.inc => SearchClass.inc                           | 0
 core/SecurityClass.inc => SecurityClass.inc                       | 0
 core/XMLDatastream.inc => XMLDatastream.inc                       | 0
 ...itory.solutionpacks.inc => fedora_repository.solutionpacks.inc | 0
 core/formClass.inc => formClass.inc                               | 0
 xsd/islandoracm.xsd => islandoracm.xsd                            | 0
 xsl/searchTerms.xml => searchTerms.xml                            | 0
 xsl/solrSearchTerms.xml => solrSearchTerms.xml                    | 0
 16 files changed, 0 insertions(+), 0 deletions(-)
 rename core/BatchIngest.inc => BatchIngest.inc (100%)
 rename core/CollectionClass.inc => CollectionClass.inc (100%)
 rename core/CollectionManagement.inc => CollectionManagement.inc (100%)
 rename core/CollectionPolicy.inc => CollectionPolicy.inc (100%)
 rename core/ConnectionHelper.inc => ConnectionHelper.inc (100%)
 rename core/ContentModel.inc => ContentModel.inc (100%)
 rename core/MimeClass.inc => MimeClass.inc (100%)
 rename core/ObjectHelper.inc => ObjectHelper.inc (100%)
 rename core/SearchClass.inc => SearchClass.inc (100%)
 rename core/SecurityClass.inc => SecurityClass.inc (100%)
 rename core/XMLDatastream.inc => XMLDatastream.inc (100%)
 rename core/fedora_repository.solutionpacks.inc => fedora_repository.solutionpacks.inc (100%)
 rename core/formClass.inc => formClass.inc (100%)
 rename xsd/islandoracm.xsd => islandoracm.xsd (100%)
 rename xsl/searchTerms.xml => searchTerms.xml (100%)
 rename xsl/solrSearchTerms.xml => solrSearchTerms.xml (100%)

diff --git a/core/BatchIngest.inc b/BatchIngest.inc
similarity index 100%
rename from core/BatchIngest.inc
rename to BatchIngest.inc
diff --git a/core/CollectionClass.inc b/CollectionClass.inc
similarity index 100%
rename from core/CollectionClass.inc
rename to CollectionClass.inc
diff --git a/core/CollectionManagement.inc b/CollectionManagement.inc
similarity index 100%
rename from core/CollectionManagement.inc
rename to CollectionManagement.inc
diff --git a/core/CollectionPolicy.inc b/CollectionPolicy.inc
similarity index 100%
rename from core/CollectionPolicy.inc
rename to CollectionPolicy.inc
diff --git a/core/ConnectionHelper.inc b/ConnectionHelper.inc
similarity index 100%
rename from core/ConnectionHelper.inc
rename to ConnectionHelper.inc
diff --git a/core/ContentModel.inc b/ContentModel.inc
similarity index 100%
rename from core/ContentModel.inc
rename to ContentModel.inc
diff --git a/core/MimeClass.inc b/MimeClass.inc
similarity index 100%
rename from core/MimeClass.inc
rename to MimeClass.inc
diff --git a/core/ObjectHelper.inc b/ObjectHelper.inc
similarity index 100%
rename from core/ObjectHelper.inc
rename to ObjectHelper.inc
diff --git a/core/SearchClass.inc b/SearchClass.inc
similarity index 100%
rename from core/SearchClass.inc
rename to SearchClass.inc
diff --git a/core/SecurityClass.inc b/SecurityClass.inc
similarity index 100%
rename from core/SecurityClass.inc
rename to SecurityClass.inc
diff --git a/core/XMLDatastream.inc b/XMLDatastream.inc
similarity index 100%
rename from core/XMLDatastream.inc
rename to XMLDatastream.inc
diff --git a/core/fedora_repository.solutionpacks.inc b/fedora_repository.solutionpacks.inc
similarity index 100%
rename from core/fedora_repository.solutionpacks.inc
rename to fedora_repository.solutionpacks.inc
diff --git a/core/formClass.inc b/formClass.inc
similarity index 100%
rename from core/formClass.inc
rename to formClass.inc
diff --git a/xsd/islandoracm.xsd b/islandoracm.xsd
similarity index 100%
rename from xsd/islandoracm.xsd
rename to islandoracm.xsd
diff --git a/xsl/searchTerms.xml b/searchTerms.xml
similarity index 100%
rename from xsl/searchTerms.xml
rename to searchTerms.xml
diff --git a/xsl/solrSearchTerms.xml b/solrSearchTerms.xml
similarity index 100%
rename from xsl/solrSearchTerms.xml
rename to solrSearchTerms.xml