From 955a276681e7ba3b19d9c411f00bac5f291db698 Mon Sep 17 00:00:00 2001
From: Ross Patterson <me@rpatterson.net>
Date: Sun, 13 Feb 2022 15:06:20 -0800
Subject: [PATCH] refactor(setup): More sensible import step define

---
 src/Products/PlonePAS/configure.zcml | 12 ------------
 src/Products/PlonePAS/profiles.zcml  | 10 ++++++++++
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Products/PlonePAS/configure.zcml b/src/Products/PlonePAS/configure.zcml
index d7c003ae..a6a123e4 100644
--- a/src/Products/PlonePAS/configure.zcml
+++ b/src/Products/PlonePAS/configure.zcml
@@ -2,7 +2,6 @@
     i18n_domain="plone"
     xmlns="http://namespaces.zope.org/zope"
     xmlns:five="http://namespaces.zope.org/five"
-    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     xmlns:i18n="http://namespaces.zope.org/i18n">
 
   <include package=".browser" />
@@ -10,17 +9,6 @@
   <include file="profiles.zcml" />
   <include file="exportimport.zcml" />
 
-  <genericsetup:importStep
-      description="Configure PlonePas"
-      handler="Products.PlonePAS.setuphandlers.setupPlonePAS"
-      name="plonepas"
-      title="PlonePAS setup">
-    <depends name="componentregistry" />
-    <depends name="controlpanel" />
-    <depends name="memberdata-properties" />
-    <depends name="rolemap" />
-  </genericsetup:importStep>
-
   <five:deprecatedManageAddDelete class=".plugins.cookie_handler.ExtendedCookieAuthHelper" />
   <five:deprecatedManageAddDelete class=".plugins.role.GroupAwareRoleManager" />
 
diff --git a/src/Products/PlonePAS/profiles.zcml b/src/Products/PlonePAS/profiles.zcml
index 84103954..2b93de24 100644
--- a/src/Products/PlonePAS/profiles.zcml
+++ b/src/Products/PlonePAS/profiles.zcml
@@ -10,5 +10,15 @@
       description="Extension profile for default PlonePAS setup."
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
+  <genericsetup:importStep
+      description="Configure PlonePas"
+      handler="Products.PlonePAS.setuphandlers.setupPlonePAS"
+      name="plonepas"
+      title="PlonePAS setup">
+    <depends name="componentregistry" />
+    <depends name="controlpanel" />
+    <depends name="memberdata-properties" />
+    <depends name="rolemap" />
+  </genericsetup:importStep>
 
 </configure>