Merge pull request #20 from kitconcept/revert-15-ree-add-solr-support

Revert "Add SOLR support"
kitconcept · Apr 13, 2024 · 60e8463 · 60e8463
2 parents 7c2b45f + b6f4e03
commit 60e8463
Show file tree

Hide file tree

Showing 34 changed files with 1 addition and 672 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,7 +2,6 @@ graft src/kitconcept
 graft docs
 graft news
 graft tests
-graft solr
 include .coveragerc
 include .dockerignore
 include .editorconfig

diff --git a/Makefile b/Makefile
@@ -161,11 +161,6 @@ solr-start: ## Start solr
 	@echo "Start solr"
 	@COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} docker compose -f ${SOLR_ONLY_COMPOSE} up -d
 
-.PHONY: solr-start-and-rebuild
-solr-start-and-rebuild: ## Start solr, force rebuild
-	@echo "Start solr, force rebuild, erases data"
-	@COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} docker compose -f ${SOLR_ONLY_COMPOSE} up -d --build
-
 .PHONY: solr-start-fg
 solr-start-fg: ## Start solr in foreground
 	@echo "Start solr in foreground"

diff --git a/setup.py b/setup.py
@@ -54,8 +54,6 @@
         "plone.distribution",
         # "plone.api",
         "kitconcept.solr",
-        "python-dateutil",
-        "collective.person",
     ],
     extras_require={
         "test": [

diff --git a/solr/Dockerfile b/solr/Dockerfile
diff --git a/src/kitconcept/intranet/behaviors/__init__.py b/src/kitconcept/intranet/behaviors/__init__.py
diff --git a/src/kitconcept/intranet/behaviors/additional_contact_info.py b/src/kitconcept/intranet/behaviors/additional_contact_info.py
diff --git a/src/kitconcept/intranet/behaviors/configure.zcml b/src/kitconcept/intranet/behaviors/configure.zcml
diff --git a/src/kitconcept/intranet/configure.zcml b/src/kitconcept/intranet/configure.zcml
@@ -10,17 +10,8 @@
       package="Products.CMFCore"
       file="permissions.zcml"
       />
-  <include
-      package="plone.behavior"
-      file="meta.zcml"
-      />
 
   <include file="dependencies.zcml" />
   <include file="distributions.zcml" />
 
-  <include file="permissions.zcml" />
-  <include file="profiles.zcml" />
-
-  <include package=".behaviors" />
-
 </configure>
diff --git a/src/kitconcept/intranet/dependencies.zcml b/src/kitconcept/intranet/dependencies.zcml
@@ -5,6 +5,5 @@
   <include package="plone.restapi" />
   <include package="plone.distribution" />
   <include package="kitconcept.solr" />
-  <include package="collective.person" />
 
 </configure>
diff --git a/src/kitconcept/intranet/distributions.zcml b/src/kitconcept/intranet/distributions.zcml
@@ -2,7 +2,7 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:i18n="http://namespaces.zope.org/i18n"
     xmlns:plone="http://namespaces.plone.org/plone"
-    i18n_domain="kitconcept.intranet"
+    i18n_domain="plone"
     >
 
   <plone:distribution

diff --git a/src/kitconcept/intranet/permissions.zcml b/src/kitconcept/intranet/permissions.zcml
diff --git a/src/kitconcept/intranet/profiles.zcml b/src/kitconcept/intranet/profiles.zcml
diff --git a/src/kitconcept/intranet/profiles/default/actions.xml b/src/kitconcept/intranet/profiles/default/actions.xml
diff --git a/src/kitconcept/intranet/profiles/default/browserlayer.xml b/src/kitconcept/intranet/profiles/default/browserlayer.xml
diff --git a/src/kitconcept/intranet/profiles/default/catalog.xml b/src/kitconcept/intranet/profiles/default/catalog.xml
diff --git a/src/kitconcept/intranet/profiles/default/metadata.xml b/src/kitconcept/intranet/profiles/default/metadata.xml
diff --git a/...intranet/profiles/default/registry/kitconcept.solr.interfaces.IKitconceptSolrSettings.xml b/...intranet/profiles/default/registry/kitconcept.solr.interfaces.IKitconceptSolrSettings.xml
diff --git a/...ept/intranet/profiles/default/registry/plone.base.interfaces.controlpanel.IMailSchema.xml b/...ept/intranet/profiles/default/registry/plone.base.interfaces.controlpanel.IMailSchema.xml
diff --git a/...ept/intranet/profiles/default/registry/plone.base.interfaces.controlpanel.ISiteSchema.xml b/...ept/intranet/profiles/default/registry/plone.base.interfaces.controlpanel.ISiteSchema.xml
diff --git a/src/kitconcept/intranet/profiles/default/registry/plone.i18n.interfaces.ILanguageSchema.xml b/src/kitconcept/intranet/profiles/default/registry/plone.i18n.interfaces.ILanguageSchema.xml
diff --git a/src/kitconcept/intranet/profiles/default/theme.xml b/src/kitconcept/intranet/profiles/default/theme.xml
diff --git a/src/kitconcept/intranet/profiles/default/types.xml b/src/kitconcept/intranet/profiles/default/types.xml
diff --git a/src/kitconcept/intranet/profiles/default/types/Person.xml b/src/kitconcept/intranet/profiles/default/types/Person.xml