add browserlayer support

src/collective/solr/Extensions/install.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+
+def uninstall(portal, reinstall=False):
+    if not reinstall:
+        setup_tool = portal.portal_setup
+        profile = 'profile-collective.solr:uninstall'
+        setup_tool.runAllImportStepsFromProfile(profile)

src/collective/solr/configure.zcml

@@ -19,6 +19,7 @@
 
   <include file="extender.zcml" />
   <include file="profiles.zcml" />
+  <include file="upgrades.zcml" />
 
   <cmf:registerDirectory name="solr_site_search" />
 

src/collective/solr/extender.py

@@ -2,6 +2,8 @@
 from Acquisition import aq_base
 from archetypes.schemaextender.field import ExtensionField
 from archetypes.schemaextender.interfaces import ISchemaExtender
+from archetypes.schemaextender.interfaces import IBrowserLayerAwareExtender
+from collective.solr.browser.interfaces import IThemeSpecific
 from plone.indexer import indexer
 from Products.Archetypes.atapi import BooleanField
 from Products.Archetypes.atapi import BooleanWidget
@@ -56,7 +58,8 @@ class ExtensionBooleanField(ExtensionField, BooleanField):
 class SearchExtender(object):
     """Adapter that adds search metadata."""
 
-    implements(ISchemaExtender)
+    implements(ISchemaExtender, IBrowserLayerAwareExtender)
+    layer = IThemeSpecific
 
     _fields = [
         ExtensionBooleanField(

src/collective/solr/extender.zcml

@@ -6,6 +6,7 @@
   <adapter
       for="Products.ATContentTypes.interface.IATContentType"
       name="collective.solr.SearchExtender"
+      provides="archetypes.schemaextender.interfaces.ISchemaExtender"
       factory=".extender.SearchExtender" />
 
 </configure>

src/collective/solr/profiles.zcml

@@ -12,6 +12,15 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="uninstall"
+      title="collective.solr"
+      directory="profiles/uninstall"
+      description="Solr integration for Plone: uninstall"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <genericsetup:registerProfile
       name="search"
       title="collective.solr (site search)"

src/collective/solr/profiles/default/metadata.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>1</version>
+  <version>2</version>
 </metadata>

src/collective/solr/profiles/uninstall/browserlayer.xml

@@ -0,0 +1,5 @@
+<layers>
+  <layer name="collective.solr.default" 
+         interface="collective.solr.browser.interfaces.IDefaultLayer"
+         remove="True" />
+</layers>

src/collective/solr/setuphandlers.py

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+from Products.CMFCore.utils import getToolByName
+import logging
+logger = logging.getLogger('collective.solr')
+
+PROFILE_ID = 'profile-collective.solr:default'
+
+
+def migrateTo2(context):
+    setup_tool = getToolByName(context, 'portal_setup')
+    setup_tool.runImportStepFromProfile(PROFILE_ID, 'browserlayer')
+    logger.info('Migrated to version 2: add browserlayer')

src/collective/solr/upgrades.zcml

@@ -0,0 +1,17 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    i18n_domain="solr">
+
+  <genericsetup:upgradeStep
+    title="Upgrade to collective.solr 2"
+    description="Add browserlayer support"
+    source="1"
+    destination="2"
+    handler=".setuphandlers.migrateTo2"
+    sortkey="1"
+    profile="collective.solr:default"
+    />
+
+
+</configure>