Index: ATMediaFile/__init__.py
===================================================================
--- ATMediaFile/__init__.py	(revision 58573)
+++ ATMediaFile/__init__.py	(working copy)
@@ -51,9 +51,8 @@
 
 from Globals import package_home
 from Products.CMFCore import utils as cmfutils
-from Products.CMFCore import CMFCorePermissions
 from Products.CMFCore import DirectoryView
-from Products.CMFPlone.PloneUtilities import ToolInit
+from Products.CMFPlone.utils import ToolInit
 from Products.Archetypes.atapi import *
 from Products.Archetypes import listTypes
 from Products.Archetypes.utils import capitalize
Index: ATMediaFile/config.py
===================================================================
--- ATMediaFile/config.py	(revision 58573)
+++ ATMediaFile/config.py	(working copy)
@@ -39,7 +39,7 @@
 # AppConfig.py in your product's root directory. This will be included
 # in this file if found.
 
-from Products.CMFCore.CMFCorePermissions import setDefaultRoles
+from Products.CMFCore.permissions import setDefaultRoles
 ##code-section config-head #fill in your manual code here
 ##/code-section config-head
 
Index: ATVideo/browser/configure.zcml
===================================================================
--- ATVideo/browser/configure.zcml	(revision 58573)
+++ ATVideo/browser/configure.zcml	(working copy)
@@ -6,8 +6,6 @@
 	   xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
            i18n_domain="ATVideo"> 
 
-  <include package="zope.app.annotation" />
-
   <browser:page
           name="transmission.xml"
       for="Products.ContentLicensing.DublinCoreExtensions.interfaces.ILicensable"
Index: ATVideo/browser/video.py
===================================================================
--- ATVideo/browser/video.py	(revision 58573)
+++ ATVideo/browser/video.py	(working copy)
@@ -14,7 +14,7 @@
 from Products.PlumiSkin.browser.interfaces import ITopicsProvider
 
 # Internationalization
-_ = i18n.MessageIDFactory("atvideo")
+_ = i18n.MessageFactory("atvideo")
 
 
 class VideoView( BrowserView ):
Index: ATVideo/__init__.py
===================================================================
--- ATVideo/__init__.py	(revision 58573)
+++ ATVideo/__init__.py	(working copy)
@@ -52,9 +52,9 @@
 
 from Globals import package_home
 from Products.CMFCore import utils as cmfutils
-from Products.CMFCore import CMFCorePermissions
+from Products.CMFCore import permissions
 from Products.CMFCore import DirectoryView
-from Products.CMFPlone.PloneUtilities import ToolInit
+from Products.CMFPlone.utils import ToolInit
 from Products.Archetypes.atapi import *
 from Products.Archetypes import listTypes
 from Products.Archetypes.utils import capitalize
Index: ATVideo/config.py
===================================================================
--- ATVideo/config.py	(revision 58573)
+++ ATVideo/config.py	(working copy)
@@ -8,7 +8,7 @@
 
 
 # Permissions and roles
-from Products.CMFCore.CMFCorePermissions import setDefaultRoles
+from Products.CMFCore.permissions import setDefaultRoles
 
 DEFAULT_ADD_CONTENT_PERMISSION = "Add portal content"
 setDefaultRoles(DEFAULT_ADD_CONTENT_PERMISSION, ('Manager', 'Owner'))
@@ -22,7 +22,7 @@
 
 # Translations and globals
 from zope import i18n
-_ = i18n.MessageIDFactory("atvideo")
+_ = i18n.MessageFactory("atvideo")
 
 TRANSCODING_STATUSES = { "-1": (False,
                                 _(u"The transcoding failed.")),
Index: DataGridField/SelectColumn.py
===================================================================
--- DataGridField/SelectColumn.py	(revision 9290)
+++ DataGridField/SelectColumn.py	(working copy)
@@ -24,7 +24,7 @@
 
 # Plone imports
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore import CMFCorePermissions
+from Products.CMFCore import permissions
 from Products.Archetypes.public import *
 from Products.Archetypes.Field import ObjectField, encode, decode, registerField
 
Index: DataGridField/Column.py
===================================================================
--- DataGridField/Column.py	(revision 9290)
+++ DataGridField/Column.py	(working copy)
@@ -24,7 +24,7 @@
 
 # Plone imports
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore import CMFCorePermissions
+from Products.CMFCore import permissions
 from Products.Archetypes.public import *
 from Products.Archetypes.Field import ObjectField, encode, decode, registerField
 
@@ -114,4 +114,4 @@
         return value
 
 # Initializes class security
-InitializeClass(Column)
\ No newline at end of file
+InitializeClass(Column)
Index: DataGridField/__init__.py
===================================================================
--- DataGridField/__init__.py	(revision 9290)
+++ DataGridField/__init__.py	(working copy)
@@ -1,6 +1,6 @@
-from Products.CMFCore import CMFCorePermissions
+from Products.CMFCore import permissions
 from Products.CMFCore.DirectoryView import registerDirectory
-from Products.CMFCore.CMFCorePermissions import AddPortalContent
+from Products.CMFCore.permissions import AddPortalContent
 from Products.CMFCore.utils import getToolByName, ContentInit
 from Products.CMFCore.DirectoryView import registerDirectory
 from Products.Archetypes.public import *
Index: DataGridField/Extensions/Install.py
===================================================================
--- DataGridField/Extensions/Install.py	(revision 9290)
+++ DataGridField/Extensions/Install.py	(working copy)
@@ -16,7 +16,7 @@
 from Products.CMFCore.TypesTool import ContentFactoryMetadata
 from Products.CMFCore.DirectoryView import addDirectoryViews
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore.CMFCorePermissions import ManagePortal
+from Products.CMFCore.permissions import ManagePortal
 from Products.Archetypes.Extensions.utils import installTypes, install_subskin
 from Products.Archetypes import listTypes
 
Index: DataGridField/DataGridField.py
===================================================================
--- DataGridField/DataGridField.py	(revision 9290)
+++ DataGridField/DataGridField.py	(working copy)
@@ -22,7 +22,7 @@
 
 # Plone imports
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore import CMFCorePermissions
+from Products.CMFCore import permissions
 from Products.Archetypes.public import *
 from Products.Archetypes.Field import ObjectField, encode, decode, registerField
 
Index: EXTERNALS.txt
===================================================================
--- EXTERNALS.txt	(revision 58573)
+++ EXTERNALS.txt	(working copy)
@@ -35,7 +35,7 @@
 #Uncomment to work on dev version of PlumiSkin
 #PlumiSkin https://svn.plone.org/svn/collective/PlumiSkin/trunk
 
-ContentLicensing https://svn.plone.org/svn/collective/ContentLicensing/tags/1.0.5-rc2/
+ContentLicensing https://svn.plone.org/svn/collective/ContentLicensing/tags/2.0.0/
 
 # A Captcha product
 PloneCaptcha https://plonecaptcha.svn.sourceforge.net/svnroot/plonecaptcha/tags/PloneCaptcha-1.0.2/