Renamed package collective.contact.content to collective.contact.core

base.cfg

@@ -1,6 +1,6 @@
 [buildout]
 plone-version = 4.2.3
-package-name = collective.contact.content
+package-name = collective.contact.core
 package-extras = [test]
 
 extends =

jenkins.cfg

@@ -5,8 +5,8 @@ extends =
     https://raw.github.com/plone/buildout.jenkins/master/jenkins.cfg
     https://raw.github.com/plone/buildout.jenkins/master/jenkins-code-analysis.cfg
 
-jenkins-test-eggs = collective.contact.content [test]
-jenkins-test-directories = src/collective/contact/content
+jenkins-test-eggs = ${buildout:package-name} ${buildout:package-extras}
+jenkins-test-directories = src/collective/contact/core
 
 parts += pylint
 

setup.py

@@ -15,9 +15,9 @@ long_description = (
     open('CHANGES.rst').read()
     + '\n')
 
-setup(name='collective.contact.content',
+setup(name='collective.contact.core',
       version=version,
-      description="Dexterity contact content type",
+      description="Core package for collective.contact add-ons",
       long_description=long_description,
       # Get more strings from
       # http://pypi.python.org/pypi?%3Aaction=list_classifiers

sources.cfg

@@ -14,6 +14,6 @@ entrouvert_push = git+ssh://git@repos.entrouvert.org
 
 [sources]
 plone.act = git ${remotes:plone}/plone.act.git pushurl=${remotes:plone_push}/plone.act.git
-collective.contact.content = git ${remotes:vincentfretin}/collective.contact.content.git pushurl=${remotes:vincentfretin_push}/collective.contact.content.git
+collective.contact.core = git ${remotes:vincentfretin}/collective.contact.core.git pushurl=${remotes:vincentfretin_push}/collective.contact.core.git
 plone.dexterity = git ${remotes:cedricmessiant}/plone.dexterity.git pushurl=${remotes:cedricmessiant_push}/plone.dexterity.git
 plone.formwidget.masterselect = git ${remotes:cedricmessiant}/plone.formwidget.masterselect.git pushurl=${remotes:cedricmessiant_push}/plone.formwidget.masterselect.git

src/collective/contact/content/locales/update.sh

@@ -1,3 +0,0 @@
-domain=collective.contact.content
-i18ndude rebuild-pot --pot $domain.pot --create $domain ../
-i18ndude sync --pot $domain.pot */LC_MESSAGES/$domain.po

src/collective/contact/core/__init__.py

@@ -1,6 +1,6 @@
 from zope.i18nmessageid import MessageFactory
 
-_ = MessageFactory("collective.contact.content")
+_ = MessageFactory("collective.contact.core")
 
 
 def initialize(context):

src/collective/contact/core/adapters.py

@@ -3,8 +3,8 @@ import vobject
 
 from Products.CMFPlone.utils import safe_unicode
 
-from collective.contact.content.interfaces import IVCard, IContactable
-from collective.contact.content.content.held_position import IHeldPosition,\
+from collective.contact.core.interfaces import IVCard, IContactable
+from collective.contact.core.content.held_position import IHeldPosition,\
                                                              HeldPosition
 
 

src/collective/contact/core/addcontact.py

@@ -15,8 +15,8 @@ from plone.supermodel import model
 from plone.dexterity.i18n import MessageFactory as DMF
 from Products.statusmessages.interfaces import IStatusMessage
 
-from collective.contact.content.schema import ContactChoice
-from collective.contact.content.source import ContactSourceBinder
+from collective.contact.core.schema import ContactChoice
+from collective.contact.core.source import ContactSourceBinder
 
 from . import _
 

src/collective/contact/core/behaviors.py

@@ -13,8 +13,8 @@ from z3c.form.widget import ComputedWidgetAttribute
 from Products.CMFDefault.utils import checkEmailAddress
 from Products.CMFDefault.exceptions import EmailAddressInvalid
 
-from collective.contact.content import _
-from collective.contact.content.interfaces import IContactable
+from collective.contact.core import _
+from collective.contact.core.interfaces import IContactable
 
 
 class InvalidEmailAddress(schema.ValidationError):

src/collective/contact/core/behaviors.zcml

@@ -3,7 +3,7 @@
 	xmlns:plone="http://namespaces.plone.org/plone"
     xmlns:i18n="http://namespaces.zope.org/i18n"
     xmlns:grok="http://namespaces.zope.org/grok"
-    i18n_domain="collective.contact.content">
+    i18n_domain="collective.contact.core">
 
     <include package="plone.behavior" file="meta.zcml" />
 

src/collective/contact/core/browser/address.py

@@ -2,8 +2,8 @@ from Acquisition import aq_base
 
 from five import grok
 
-from collective.contact.content.behaviors import IContactDetails
-from collective.contact.content.browser import TEMPLATES_DIR
+from collective.contact.core.behaviors import IContactDetails
+from collective.contact.core.browser import TEMPLATES_DIR
 
 
 grok.templatedir(TEMPLATES_DIR)

src/collective/contact/core/browser/configure.zcml

@@ -4,7 +4,7 @@
     xmlns:i18n="http://namespaces.zope.org/i18n"
     xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
-    i18n_domain="collective.contact.content">
+    i18n_domain="collective.contact.core">
 
   <include package="plone.formwidget.autocomplete" />
 

src/collective/contact/core/browser/contact.py

@@ -1,7 +1,7 @@
-from collective.contact.content.browser.contactable import BaseView
-from collective.contact.content.browser.utils import get_ttw_fields,\
+from collective.contact.core.browser.contactable import BaseView
+from collective.contact.core.browser.utils import get_ttw_fields,\
     date_to_DateTime
-from collective.contact.content.interfaces import IContactable
+from collective.contact.core.interfaces import IContactable
 
 
 class Contact(BaseView):

src/collective/contact/core/browser/contactable.py

@@ -9,10 +9,10 @@ from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from plone.dexterity.browser.view import DefaultView
 from plone.dexterity.utils import getAdditionalSchemata
 
-from collective.contact.content.browser import TEMPLATES_DIR
-from collective.contact.content.browser.address import get_address
-from collective.contact.content.behaviors import IContactDetails
-from collective.contact.content.interfaces import IContactContent, IContactable
+from collective.contact.core.browser import TEMPLATES_DIR
+from collective.contact.core.browser.address import get_address
+from collective.contact.core.behaviors import IContactDetails
+from collective.contact.core.interfaces import IContactContent, IContactable
 
 
 class Contactable(grok.Adapter):

src/collective/contact/core/browser/organization.py

@@ -3,9 +3,9 @@ from zope.schema.interfaces import IVocabularyFactory
 
 from Products.CMFCore.utils import getToolByName
 
-from collective.contact.content.browser.contactable import BaseView
-from collective.contact.content.browser.utils import get_ttw_fields
-from collective.contact.content.interfaces import IContactable
+from collective.contact.core.browser.contactable import BaseView
+from collective.contact.core.browser.utils import get_ttw_fields
+from collective.contact.core.interfaces import IContactable
 
 
 class Organization(BaseView):

src/collective/contact/core/browser/person.py

@@ -1,9 +1,9 @@
 from Products.CMFCore.utils import getToolByName
 
-from collective.contact.content.browser.contactable import BaseView
-from collective.contact.content.browser.utils import date_to_DateTime,\
+from collective.contact.core.browser.contactable import BaseView
+from collective.contact.core.browser.utils import date_to_DateTime,\
                                                      get_ttw_fields
-from collective.contact.content.interfaces import IContactable
+from collective.contact.core.interfaces import IContactable
 
 
 class Person(BaseView):

src/collective/contact/core/browser/position.py

@@ -1,9 +1,9 @@
 from zope.component import getUtility
 from zope.schema.interfaces import IVocabularyFactory
 
-from collective.contact.content.browser.contactable import BaseView
-from collective.contact.content.browser.utils import get_ttw_fields
-from collective.contact.content.interfaces import IContactable
+from collective.contact.core.browser.contactable import BaseView
+from collective.contact.core.browser.utils import get_ttw_fields
+from collective.contact.core.interfaces import IContactable
 
 
 class Position(BaseView):

src/collective/contact/core/browser/templates/address.pt

@@ -1,5 +1,5 @@
 <div class="field" id="address"
-     i18n:domain="collective.contact.content"
+     i18n:domain="collective.contact.core"
      tal:repeat="address args">
     <div tal:condition="address">
     <label i18n:translate="">Address&nbsp;:</label>

src/collective/contact/core/browser/templates/contact.pt

@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
       lang="en"
       metal:use-macro="context/main_template/macros/master"
-      i18n:domain="collective.contact.content">
+      i18n:domain="collective.contact.core">
 <body>
 
 <div metal:fill-slot="main">

src/collective/contact/core/browser/templates/organization.pt

@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
       lang="en"
       metal:use-macro="context/main_template/macros/master"
-      i18n:domain="collective.contact.content">
+      i18n:domain="collective.contact.core">
 <body>
 
 <div metal:fill-slot="main">

src/collective/contact/core/browser/templates/person.pt

@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
       lang="en"
       metal:use-macro="context/main_template/macros/master"
-      i18n:domain="collective.contact.content">
+      i18n:domain="collective.contact.core">
 <body>
 
 <div metal:fill-slot="main">

src/collective/contact/core/browser/templates/position.pt

@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
       lang="en"
       metal:use-macro="context/main_template/macros/master"
-      i18n:domain="collective.contact.content">
+      i18n:domain="collective.contact.core">
 <body>
 
 <div metal:fill-slot="main">

src/collective/contact/core/browser/vcard_export.py

@@ -1,7 +1,7 @@
 from five import grok
 
-from collective.contact.content.interfaces import IVCard
-from collective.contact.content.content.held_position import IHeldPosition
+from collective.contact.core.interfaces import IVCard
+from collective.contact.core.content.held_position import IHeldPosition
 
 
 class ContactVCF(grok.View):

src/collective/contact/core/configure.zcml

@@ -3,7 +3,7 @@
     xmlns:grok="http://namespaces.zope.org/grok"
     xmlns:i18n="http://namespaces.zope.org/i18n"
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
-    i18n_domain="collective.contact.content">
+    i18n_domain="collective.contact.core">
 
   <i18n:registerTranslations directory="locales" />
 
@@ -25,32 +25,32 @@
   <include file="widgets.zcml" />
 
   <genericsetup:importStep
-      name="collective.contact.content-postInstall"
-      title="collective.contact.content postInstall import step"
-      description="Post install import step from collective.contact.content"
+      name="collective.contact.core-postInstall"
+      title="collective.contact.core postInstall import step"
+      description="Post install import step from collective.contact.core"
       handler=".setuphandlers.postInstall">
   </genericsetup:importStep>
 
   <genericsetup:importStep
-      name="collective.contact.content-createTestData"
-      title="collective.contact.content createTestData import step"
-      description="Create test data import step from collective.contact.content"
+      name="collective.contact.core-createTestData"
+      title="collective.contact.core createTestData import step"
+      description="Create test data import step from collective.contact.core"
       handler=".setuphandlers.createTestData">
   </genericsetup:importStep>
 
   <genericsetup:registerProfile
       name="default"
-      title="collective.contact.content"
+      title="collective.contact.core"
       directory="profiles/default"
-      description="Installs the collective.contact.content package"
+      description="Installs the collective.contact.core package"
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
   <genericsetup:registerProfile
       name="test_data"
-      title="collective.contact.content test data"
+      title="collective.contact.core test data"
       directory="profiles/test_data"
-      description="Installs test data for the collective.contact.content package"
+      description="Installs test data for the collective.contact.core package"
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 

src/collective/contact/core/content/directory.py

@@ -10,7 +10,7 @@ from plone.supermodel import model
 
 from collective.z3cform.datagridfield import DataGridFieldFactory, DictRow
 
-from collective.contact.content import _
+from collective.contact.core import _
 
 
 class INameTokenTableRowSchema(Interface):

src/collective/contact/core/content/held_position.py

@@ -7,11 +7,11 @@ from plone.dexterity.schema import DexteritySchemaPolicy
 from plone.dexterity.content import Container
 from plone.supermodel import model
 
-from collective.contact.content import _
-from collective.contact.content.schema import ContactChoice
-from collective.contact.content.source import ContactSourceBinder
-from collective.contact.content.interfaces import IContactContent
-from collective.contact.content.browser.contactable import Contactable
+from collective.contact.core import _
+from collective.contact.core.schema import ContactChoice
+from collective.contact.core.source import ContactSourceBinder
+from collective.contact.core.interfaces import IContactContent
+from collective.contact.core.browser.contactable import Contactable
 
 
 class IHeldPosition(model.Schema, IContactContent):

src/collective/contact/core/content/organization.py

@@ -11,9 +11,9 @@ from plone.dexterity.content import Container
 from plone.supermodel import model
 from plone.dexterity.schema import DexteritySchemaPolicy
 
-from collective.contact.content import _
-from collective.contact.content.interfaces import IContactContent
-from collective.contact.content.browser.contactable import Contactable
+from collective.contact.core import _
+from collective.contact.core.interfaces import IContactContent
+from collective.contact.core.browser.contactable import Contactable
 
 
 class IOrganization(model.Schema, IContactContent):

src/collective/contact/core/content/person.py

@@ -11,9 +11,9 @@ from plone.dexterity.schema import DexteritySchemaPolicy
 from plone.namedfile.field import NamedImage
 from plone.supermodel import model
 
-from collective.contact.content import _
-from collective.contact.content.interfaces import IContactContent
-from collective.contact.content.browser.contactable import Contactable
+from collective.contact.core import _
+from collective.contact.core.interfaces import IContactContent
+from collective.contact.core.browser.contactable import Contactable
 
 
 class IPerson(model.Schema, IContactContent):

src/collective/contact/core/content/position.py

@@ -8,9 +8,9 @@ from plone.dexterity.content import Container
 from plone.supermodel import model
 from plone.dexterity.schema import DexteritySchemaPolicy
 
-from collective.contact.content import _
-from collective.contact.content.interfaces import IContactContent
-from collective.contact.content.browser.contactable import Contactable
+from collective.contact.core import _
+from collective.contact.core.interfaces import IContactContent
+from collective.contact.core.browser.contactable import Contactable
 
 
 class IPosition(model.Schema, IContactContent):

src/collective/contact/core/indexers.py

@@ -1,7 +1,7 @@
 from plone.indexer import indexer
 
-from collective.contact.content.content.held_position import IHeldPosition
-from collective.contact.content.content.organization import IOrganization
+from collective.contact.core.content.held_position import IHeldPosition
+from collective.contact.core.content.organization import IOrganization
 
 
 @indexer(IOrganization)

src/collective/contact/core/interfaces.py

@@ -4,7 +4,7 @@ from plone.formwidget.autocomplete.interfaces import IAutocompleteWidget
 
 
 class IContactContent(Interface):
-    """Base class for collective.contact.content content types"""
+    """Base class for collective.contact.core content types"""
 
 
 class IContactAutocompleteWidget(IAutocompleteWidget):

src/collective/contact/core/locales/collective.contact.core.pot

@@ -15,7 +15,7 @@ msgstr ""
 "Language-Code: en\n"
 "Language-Name: English\n"
 "Preferred-Encodings: utf-8 latin1\n"
-"Domain: collective.contact.content\n"
+"Domain: collective.contact.core\n"
 
 #: ../widgets.py:133
 msgid "(nothing)"

src/collective/contact/core/locales/fr/LC_MESSAGES/collective.contact.core.po

@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: collective.contact.content\n"
+"Project-Id-Version: collective.contact.core\n"
 "POT-Creation-Date: 2013-01-24 10:07+0000\n"
 "PO-Revision-Date: 2013-01-24 11:23+0100\n"
 "Last-Translator: Cédric Messiant <cedricmessiant@ecreall.com>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Language-Code: fr\n"
 "Language-Name: French\n"
 "Preferred-Encodings: utf-8 latin1\n"
-"Domain: collective.contact.content\n"
+"Domain: collective.contact.core\n"
 
 #: ../widgets.py:133
 msgid "(nothing)"

src/collective/contact/core/locales/update.sh

@@ -0,0 +1,3 @@
+domain=collective.contact.core
+i18ndude rebuild-pot --pot $domain.pot --create $domain ../
+i18ndude sync --pot $domain.pot */LC_MESSAGES/$domain.po

src/collective/contact/core/profiles/default/types/directory.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<object name="directory" meta_type="Dexterity FTI" i18n:domain="collective.contact.content"
+<object name="directory" meta_type="Dexterity FTI" i18n:domain="collective.contact.core"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title" i18n:translate="">Directory</property>
  <property name="description" i18n:translate=""></property>
@@ -22,7 +22,7 @@
  </property>
  <property name="default_view_fallback">False</property>
  <property name="add_permission">cmf.AddPortalContent</property>
- <property name="klass">collective.contact.content.content.directory.Directory</property>
+ <property name="klass">collective.contact.core.content.directory.Directory</property>
  <property name="behaviors">
   <element value="plone.app.dexterity.behaviors.metadata.IBasic"/>
   <element value="plone.app.content.interfaces.INameFromTitle"/>

src/collective/contact/core/profiles/default/types/held_position.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<object name="held_position" meta_type="Dexterity FTI" i18n:domain="collective.contact.content"
+<object name="held_position" meta_type="Dexterity FTI" i18n:domain="collective.contact.core"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title" i18n:translate="">Held position</property>
  <property name="description" i18n:translate=""></property>
@@ -19,7 +19,7 @@
  </property>
  <property name="default_view_fallback">False</property>
  <property name="add_permission">cmf.AddPortalContent</property>
- <property name="klass">collective.contact.content.content.held_position.HeldPosition</property>
+ <property name="klass">collective.contact.core.content.held_position.HeldPosition</property>
  <property name="behaviors">
   <element value="plone.app.content.interfaces.INameFromTitle"/>
  </property>

src/collective/contact/core/profiles/default/types/organization.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<object name="organization" meta_type="Dexterity FTI" i18n:domain="collective.contact.content"
+<object name="organization" meta_type="Dexterity FTI" i18n:domain="collective.contact.core"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title" i18n:translate="">Organization</property>
  <property name="description" i18n:translate=""></property>
@@ -22,11 +22,11 @@
  </property>
  <property name="default_view_fallback">False</property>
  <property name="add_permission">cmf.AddPortalContent</property>
- <property name="klass">collective.contact.content.content.organization.Organization</property>
+ <property name="klass">collective.contact.core.content.organization.Organization</property>
  <property name="behaviors">
   <element value="plone.app.dexterity.behaviors.metadata.IBasic"/>
   <element value="plone.app.content.interfaces.INameFromTitle"/>
-  <element value="collective.contact.content.behaviors.IContactDetails" />
+  <element value="collective.contact.core.behaviors.IContactDetails" />
  </property>
  <property name="schema"/>
  <!-- DO NOT use a model_source or it removes manually added fields while reapplying the profile -->

src/collective/contact/core/profiles/default/types/person.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<object name="person" meta_type="Dexterity FTI" i18n:domain="collective.contact.content"
+<object name="person" meta_type="Dexterity FTI" i18n:domain="collective.contact.core"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title" i18n:translate="">Person</property>
  <property name="description" i18n:translate=""></property>
@@ -20,10 +20,10 @@
  </property>
  <property name="default_view_fallback">False</property>
  <property name="add_permission">cmf.AddPortalContent</property>
- <property name="klass">collective.contact.content.content.person.Person</property>
+ <property name="klass">collective.contact.core.content.person.Person</property>
  <property name="behaviors">
   <element value="plone.app.content.interfaces.INameFromTitle"/>
-  <element value="collective.contact.content.behaviors.IContactDetails" />
+  <element value="collective.contact.core.behaviors.IContactDetails" />
 </property>
  <property name="schema" />
  <!-- DO NOT use a model_source or it removes manually added fields while reapplying the profile -->

src/collective/contact/core/profiles/default/types/position.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<object name="position" meta_type="Dexterity FTI" i18n:domain="collective.contact.content"
+<object name="position" meta_type="Dexterity FTI" i18n:domain="collective.contact.core"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title" i18n:translate="">Position</property>
  <property name="description" i18n:translate=""></property>
@@ -19,11 +19,11 @@
  </property>
  <property name="default_view_fallback">False</property>
  <property name="add_permission">cmf.AddPortalContent</property>
- <property name="klass">collective.contact.content.content.position.Position</property>
+ <property name="klass">collective.contact.core.content.position.Position</property>
  <property name="behaviors">
   <element value="plone.app.dexterity.behaviors.metadata.IBasic"/>
   <element value="plone.app.content.interfaces.INameFromTitle"/>
-  <element value="collective.contact.content.behaviors.IContactDetails" />
+  <element value="collective.contact.core.behaviors.IContactDetails" />
  </property>
  <property name="schema" />
  <!-- DO NOT use a model_source or it removes manually added fields while reapplying the profile -->

src/collective/contact/core/profiles/test_data/metadata.xml

@@ -2,6 +2,6 @@
 <metadata>
   <version>0001</version>
   <dependencies>
-  	<dependency>profile-collective.contact.content:default</dependency>
+  	<dependency>profile-collective.contact.core:default</dependency>
   </dependencies>
 </metadata>

src/collective/contact/core/profiles/testing/metadata.xml

@@ -2,6 +2,6 @@
 <metadata>
   <version>0001</version>
   <dependencies>
-    <dependency>profile-collective.contact.content:default</dependency>
+    <dependency>profile-collective.contact.core:default</dependency>
   </dependencies>
 </metadata>

src/collective/contact/core/profiles/testing/types/testtype.xml

@@ -19,8 +19,8 @@
  <property name="default_view_fallback">False</property>
  <property name="add_permission">cmf.AddPortalContent</property>
  <property name="behaviors">
- 	<element value="collective.contact.content.behaviors.IContactDetails" />
- 	<element value="collective.contact.content.behaviors.IGlobalPositioning" />
+ 	<element value="collective.contact.core.behaviors.IContactDetails" />
+ 	<element value="collective.contact.core.behaviors.IGlobalPositioning" />
 </property>
  <property name="schema" />
  <!-- DO NOT use a model_source or it removes manually added fields while reapplying the profile -->

src/collective/contact/core/setuphandlers.py

@@ -16,7 +16,7 @@ from zope.intid.interfaces import IIntIds
 from z3c.relationfield.relation import RelationValue
 
 import logging
-logger = logging.getLogger('collective.contact.content: setuphandlers')
+logger = logging.getLogger('collective.contact.core: setuphandlers')
 
 
 def isNotCollectiveContactContentProfile(context):
@@ -42,7 +42,7 @@ def postInstall(context):
 
 
 def createTestData(context):
-    """Create test data for collective.contact.content"""
+    """Create test data for collective.contact.core"""
     if isNotTestDataProfile(context): return
     portal = context.getSite()
 

src/collective/contact/core/testing.py

@@ -4,21 +4,21 @@ from plone.app.testing import PloneWithPackageLayer
 from plone.app.testing import IntegrationTesting
 from plone.app.testing import FunctionalTesting
 
-import collective.contact.content
+import collective.contact.core
 
 
 class ContactContentLayer(PloneWithPackageLayer):
 
     def setUpPloneSite(self, portal):
-        self.applyProfile(portal, 'collective.contact.content:testing')
+        self.applyProfile(portal, 'collective.contact.core:testing')
         # insert some test data
-        self.applyProfile(portal, 'collective.contact.content:test_data')
+        self.applyProfile(portal, 'collective.contact.core:test_data')
 
 
 COLLECTIVE_CONTACT_CONTENT = ContactContentLayer(
-    zcml_package=collective.contact.content,
+    zcml_package=collective.contact.core,
     zcml_filename='testing.zcml',
-    gs_profile_id='collective.contact.content:testing',
+    gs_profile_id='collective.contact.core:testing',
     name="COLLECTIVE_CONTACT_CONTENT")
 
 INTEGRATION = IntegrationTesting(

src/collective/contact/core/testing.zcml

@@ -3,7 +3,7 @@
     xmlns:five="http://namespaces.zope.org/five"
     xmlns:i18n="http://namespaces.zope.org/i18n"
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
-    i18n_domain="collective.contact.content">
+    i18n_domain="collective.contact.core">
 
   <include file="configure.zcml" />
 
@@ -11,9 +11,9 @@
 
   <genericsetup:registerProfile
       name="testing"
-      title="collective.contact.content tests"
+      title="collective.contact.core tests"
       directory="profiles/testing"
-      description="Steps to ease tests of collective.contact.content"
+      description="Steps to ease tests of collective.contact.core"
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 

src/collective/contact/core/tests/test_adapters.py

@@ -4,8 +4,8 @@ import unittest2 as unittest
 
 from ecreall.helpers.testing.base import BaseTest
 
-from collective.contact.content.testing import INTEGRATION
-from collective.contact.content.interfaces import IVCard
+from collective.contact.core.testing import INTEGRATION
+from collective.contact.core.interfaces import IVCard
 
 
 class TestAdapters(unittest.TestCase, BaseTest):

src/collective/contact/core/tests/test_behaviors.py

@@ -10,8 +10,8 @@ from plone.app.testing.interfaces import TEST_USER_NAME, TEST_USER_ID
 
 from ecreall.helpers.testing.base import BaseTest
 
-from collective.contact.content.testing import INTEGRATION
-from collective.contact.content.behaviors import IContactDetails,\
+from collective.contact.core.testing import INTEGRATION
+from collective.contact.core.behaviors import IContactDetails,\
     IGlobalPositioning
 
 
@@ -31,9 +31,9 @@ class TestBehaviors(unittest.TestCase, BaseTest):
 
     def test_behaviors_installation(self):
         contact_details_behavior = getUtility(IBehavior,
-                name='collective.contact.content.behaviors.IContactDetails')
+                name='collective.contact.core.behaviors.IContactDetails')
         global_positioning_behavior = getUtility(IBehavior,
-                name='collective.contact.content.behaviors.IGlobalPositioning')
+                name='collective.contact.core.behaviors.IGlobalPositioning')
         self.assertEqual(contact_details_behavior.interface, IContactDetails)
         self.assertEqual(global_positioning_behavior.interface,
                          IGlobalPositioning)

src/collective/contact/core/tests/test_content_types.py

@@ -6,7 +6,7 @@ import datetime
 
 from ecreall.helpers.testing.base import BaseTest
 
-from collective.contact.content.testing import INTEGRATION
+from collective.contact.core.testing import INTEGRATION
 
 
 class TestContentTypes(unittest.TestCase, BaseTest):

src/collective/contact/core/tests/test_search.py

@@ -6,8 +6,8 @@ from Products.CMFCore.utils import getToolByName
 
 from ecreall.helpers.testing.base import BaseTest
 
-from collective.contact.content.testing import INTEGRATION
-from collective.contact.content.indexers import held_position_searchable_text,\
+from collective.contact.core.testing import INTEGRATION
+from collective.contact.core.indexers import held_position_searchable_text,\
     organization_searchable_text
 
 

src/collective/contact/core/tests/test_setup.py

@@ -2,7 +2,7 @@ import unittest2 as unittest
 
 from Products.CMFCore.utils import getToolByName
 
-from collective.contact.content.testing import INTEGRATION
+from collective.contact.core.testing import INTEGRATION
 
 
 class TestSetup(unittest.TestCase):
@@ -18,7 +18,7 @@ class TestSetup(unittest.TestCase):
         """ Validate that our products GS profile has been run and the product
             installed
         """
-        pid = 'collective.contact.content'
+        pid = 'collective.contact.core'
         installed = [p['id'] for p in self.qi_tool.listInstalledProducts()]
         self.assertTrue(pid in installed,
                         'package appears not to have been installed')

src/collective/contact/core/tests/test_views.py

@@ -5,7 +5,7 @@ from plone.app.testing.interfaces import TEST_USER_NAME
 
 from ecreall.helpers.testing.base import BaseTest
 
-from collective.contact.content.testing import INTEGRATION
+from collective.contact.core.testing import INTEGRATION
 
 
 ADDRESS_FIELDS = ['country', 'region', 'zip_code',

src/collective/contact/core/vocabulary.py

@@ -14,7 +14,7 @@ class NoDirectoryFound(Exception):
 
 
 def get_directory(context):
-    """Get collective.contact.content Directory"""
+    """Get collective.contact.core Directory"""
     parent = context
     while parent.portal_type != "directory":
         parent = aq_parent(parent)