From bade155f295552368af89b5f77825b5596949ab2 Mon Sep 17 00:00:00 2001
From: Andrew Hind <andy.hind@alfresco.com>
Date: Mon, 16 Sep 2013 19:25:01 +0000
Subject: [PATCH] Part fix for ALF-19926  Search Service does not support
 setting up database query options - JMX support for optional patch checking

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/bootstrap-context.xml                        | 2 +-
 .../alfresco/subsystems/Search/common-opencmis-context.xml   | 2 +-
 config/alfresco/subsystems/Search/common-search-context.xml  | 2 +-
 .../patch/OptionalPatchApplicationCheckBootstrapBean.java    | 5 +++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index 5098004e7d..849a60c4cc 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -424,7 +424,7 @@
     </bean>
 
 
-    <bean id="metdataQueryIndexesCheck" class="org.alfresco.repo.admin.patch.OptionalPatchApplicationCheckBootstrapBean">
+    <bean id="metadataQueryIndexesCheck" class="org.alfresco.repo.admin.patch.OptionalPatchApplicationCheckBootstrapBean">
         <property name="patchService">
             <ref bean="PatchService" />
         </property>
diff --git a/config/alfresco/subsystems/Search/common-opencmis-context.xml b/config/alfresco/subsystems/Search/common-opencmis-context.xml
index d04beb6ae8..7814af93fe 100644
--- a/config/alfresco/subsystems/Search/common-opencmis-context.xml
+++ b/config/alfresco/subsystems/Search/common-opencmis-context.xml
@@ -57,7 +57,7 @@
             <ref bean="OpenCMISDictionaryService" />
         </property>
         <property name="optionalPatchApplicationCheckBootstrapBean">
-            <ref bean="metdataQueryIndexesCheck" />
+            <ref bean="metadataQueryIndexesCheck" />
         </property>
     </bean>
 </beans>
diff --git a/config/alfresco/subsystems/Search/common-search-context.xml b/config/alfresco/subsystems/Search/common-search-context.xml
index 0f8b931596..133ada6091 100644
--- a/config/alfresco/subsystems/Search/common-search-context.xml
+++ b/config/alfresco/subsystems/Search/common-search-context.xml
@@ -102,7 +102,7 @@
             <ref bean="namespaceService" />
         </property>
         <property name="optionalPatchApplicationCheckBootstrapBean">
-            <ref bean="metdataQueryIndexesCheck" />
+            <ref bean="metadataQueryIndexesCheck" />
         </property>
     </bean>
     
diff --git a/source/java/org/alfresco/repo/admin/patch/OptionalPatchApplicationCheckBootstrapBean.java b/source/java/org/alfresco/repo/admin/patch/OptionalPatchApplicationCheckBootstrapBean.java
index 7403a110fa..e88f3d5e17 100644
--- a/source/java/org/alfresco/repo/admin/patch/OptionalPatchApplicationCheckBootstrapBean.java
+++ b/source/java/org/alfresco/repo/admin/patch/OptionalPatchApplicationCheckBootstrapBean.java
@@ -110,4 +110,9 @@ public class OptionalPatchApplicationCheckBootstrapBean extends AbstractLifecycl
     {
         return patchApplied;
     }
+    
+    public String getPatchId()
+    {
+        return patch.getId();
+    }
 }