Manage profiles differently

collective · Jun 13, 2017 · b8b0e49 · b8b0e49
1 parent 367ef86
commit b8b0e49
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 12 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,7 +7,8 @@ Changelog
 
 - Tests on Plone5 and Plone4.
   [bsuttor]
-
+- Manage profiles differently
+  [sgeulette]
 
 0.12 (2017-05-30)
 -----------------
@@ -69,7 +70,7 @@ Changelog
 ----------------
 
 - Do not pass a default 'context' in utils._ to avoid strange ConnectionStateError.
-  [gbastien] 
+  [gbastien]
 - Give context to translate method.
   [sgeulette]
 - Corrected and added icon type images.

diff --git a/src/collective/messagesviewlet/profiles.zcml b/src/collective/messagesviewlet/profiles.zcml
@@ -1,14 +1,15 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     xmlns:five="http://namespaces.zope.org/five"
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     xmlns:i18n="http://namespaces.zope.org/i18n"
     i18n_domain="collective.messagesviewlet">
 
 <genericsetup:registerProfile
-    name="default"
+    name="install-base"
     title="collective.messagesviewlet installation"
-    directory="profiles/default"
+    directory="profiles/base"
     description="Installs the collective.messagesviewlet add-on."
     provides="Products.GenericSetup.interfaces.EXTENSION"
     />
@@ -22,15 +23,17 @@
     />
 
   <genericsetup:registerProfile
-      name="plone5"
+      zcml:condition="have plone-5"
+      name="default"
       title="collective.messagesviewlet plone5 installation"
       directory="profiles/plone5"
       description="Installs the collective.messagesviewlet add-on on Plone 5."
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
   <genericsetup:registerProfile
-      name="plone4"
+      zcml:condition="not-have plone-5"
+      name="default"
       title="collective.messagesviewlet plone4 installation"
       directory="profiles/plone4"
       description="Installs the collective.messagesviewlet add-on on Plone 4."

diff --git a/...viewlet/profiles/default/browserlayer.xml → ...gesviewlet/profiles/base/browserlayer.xml b/...viewlet/profiles/default/browserlayer.xml → ...gesviewlet/profiles/base/browserlayer.xml
diff --git a/...ult/collectivemessagesviewlet_default.txt → ...s/base/collectivemessagesviewlet_base.txt b/...ult/collectivemessagesviewlet_default.txt → ...s/base/collectivemessagesviewlet_base.txt
diff --git a/...viewlet/profiles/default/controlpanel.xml → ...gesviewlet/profiles/base/controlpanel.xml b/...viewlet/profiles/default/controlpanel.xml → ...gesviewlet/profiles/base/controlpanel.xml
diff --git a/...viewlet/profiles/default/import_steps.xml → ...gesviewlet/profiles/base/import_steps.xml b/...viewlet/profiles/default/import_steps.xml → ...gesviewlet/profiles/base/import_steps.xml
diff --git a/...agesviewlet/profiles/default/metadata.xml → ...essagesviewlet/profiles/base/metadata.xml b/...agesviewlet/profiles/default/metadata.xml → ...essagesviewlet/profiles/base/metadata.xml
diff --git a/...sagesviewlet/profiles/default/rolemap.xml → ...messagesviewlet/profiles/base/rolemap.xml b/...sagesviewlet/profiles/default/rolemap.xml → ...messagesviewlet/profiles/base/rolemap.xml
diff --git a/...essagesviewlet/profiles/default/types.xml → ...e/messagesviewlet/profiles/base/types.xml b/...essagesviewlet/profiles/default/types.xml → ...e/messagesviewlet/profiles/base/types.xml
diff --git a/...iewlet/profiles/default/types/Message.xml → ...esviewlet/profiles/base/types/Message.xml b/...iewlet/profiles/default/types/Message.xml → ...esviewlet/profiles/base/types/Message.xml
diff --git a/...profiles/default/types/MessagesConfig.xml → ...et/profiles/base/types/MessagesConfig.xml b/...profiles/default/types/MessagesConfig.xml → ...et/profiles/base/types/MessagesConfig.xml
diff --git a/...gesviewlet/profiles/default/workflows.xml → ...ssagesviewlet/profiles/base/workflows.xml b/...gesviewlet/profiles/default/workflows.xml → ...ssagesviewlet/profiles/base/workflows.xml
diff --git a/...workflows/message_workflow/definition.xml → ...workflows/message_workflow/definition.xml b/...workflows/message_workflow/definition.xml → ...workflows/message_workflow/definition.xml
diff --git a/src/collective/messagesviewlet/profiles/plone4/collectivemessagesviewlet_default.txt b/src/collective/messagesviewlet/profiles/plone4/collectivemessagesviewlet_default.txt
diff --git a/src/collective/messagesviewlet/profiles/plone4/metadata.xml b/src/collective/messagesviewlet/profiles/plone4/metadata.xml
@@ -2,6 +2,6 @@
 <metadata>
   <version>1000</version>
   <dependencies>
-    <dependency>profile-collective.messagesviewlet:default</dependency>
+    <dependency>profile-collective.messagesviewlet:install-base</dependency>
   </dependencies>
 </metadata>
diff --git a/src/collective/messagesviewlet/profiles/plone5/collectivemessagesviewlet_default.txt b/src/collective/messagesviewlet/profiles/plone5/collectivemessagesviewlet_default.txt
diff --git a/src/collective/messagesviewlet/profiles/plone5/metadata.xml b/src/collective/messagesviewlet/profiles/plone5/metadata.xml
@@ -2,6 +2,6 @@
 <metadata>
   <version>1000</version>
   <dependencies>
-    <dependency>profile-collective.messagesviewlet:default</dependency>
+    <dependency>profile-collective.messagesviewlet:install-base</dependency>
   </dependencies>
 </metadata>
diff --git a/src/collective/messagesviewlet/testing.py b/src/collective/messagesviewlet/testing.py
@@ -20,10 +20,7 @@ def setUpZope(self, app, configurationContext):
         self.loadZCML(package=collective.messagesviewlet)
 
     def setUpPloneSite(self, portal):
-        if IS_PLONE_5:
-            applyProfile(portal, 'collective.messagesviewlet:plone5')
-        else:
-            applyProfile(portal, 'collective.messagesviewlet:plone4')
+        applyProfile(portal, 'collective.messagesviewlet:default')
         api.user.create(email='test@imio.be', username='test')
         api.user.grant_roles(username='test', roles=['Site Administrator'])