[CMF-checkins] SVN: CMF/branches/1.6/C - CMFDefault: The "Sample
CMF Content" GenericSetup profile was
Jens Vagelpohl
jens at dataflake.org
Thu Sep 7 06:16:11 EDT 2006
Log message for revision 70021:
- CMFDefault: The "Sample CMF Content" GenericSetup profile was
registered but missing all of its files and necessary interface
declarations in the CMFDefault content classes.
(http://www.zope.org/Collectors/CMF/453)
Changed:
U CMF/branches/1.6/CHANGES.txt
U CMF/branches/1.6/CMFDefault/Document.py
U CMF/branches/1.6/CMFDefault/File.py
U CMF/branches/1.6/CMFDefault/Image.py
U CMF/branches/1.6/CMFDefault/Link.py
A CMF/branches/1.6/CMFDefault/profiles/sample_content/
A CMF/branches/1.6/CMFDefault/profiles/sample_content/export_steps.xml
A CMF/branches/1.6/CMFDefault/profiles/sample_content/import_steps.xml
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.objects
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.preserve
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.properties
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/.objects
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/.properties
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/a_link
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/binary_file.tgz
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/binary_image.png
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/html_document
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/some_news
A CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/stx_document
-=-
Modified: CMF/branches/1.6/CHANGES.txt
===================================================================
--- CMF/branches/1.6/CHANGES.txt 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CHANGES.txt 2006-09-07 10:16:08 UTC (rev 70021)
@@ -2,6 +2,11 @@
Bug Fixes
+ - CMFDefault: The "Sample CMF Content" GenericSetup profile was
+ registered but missing all of its files and necessary interface
+ declarations in the CMFDefault content classes.
+ (http://www.zope.org/Collectors/CMF/453)
+
- DCWorkflow: Fixed errors and site breakage on GenericSetup import
of transitions with variable expressions set. They were previously
being imported as text rather tha Expressions.
Modified: CMF/branches/1.6/CMFDefault/Document.py
===================================================================
--- CMF/branches/1.6/CMFDefault/Document.py 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/Document.py 2006-09-07 10:16:08 UTC (rev 70021)
@@ -31,12 +31,17 @@
from Products.CMFCore.PortalContent import PortalContent
from Products.CMFCore.utils import contributorsplitter
from Products.CMFCore.utils import keywordsplitter
+from zope.interface import implements
+from Products.GenericSetup.interfaces import IDAVAware
from DublinCore import DefaultDublinCoreImpl
from exceptions import EditingConflict
from exceptions import ResourceLockedError
-from interfaces.Document import IDocument
-from interfaces.Document import IMutableDocument
+from interfaces.Document import IDocument as z2IDocument
+from interfaces.Document import IMutableDocument as z2IMutableDocument
+from interfaces import IDocument
+from interfaces import IMutableDocument
+
from permissions import ModifyPortalContent
from permissions import View
from utils import _dtmldir
@@ -90,7 +95,8 @@
class Document(PortalContent, DefaultDublinCoreImpl):
""" A Document - Handles both StructuredText and HTML """
- __implements__ = (IDocument, IMutableDocument,
+ implements(IDocument, IMutableDocument, IDAVAware)
+ __implements__ = (z2IDocument, z2IMutableDocument,
PortalContent.__implements__,
DefaultDublinCoreImpl.__implements__)
Modified: CMF/branches/1.6/CMFDefault/File.py
===================================================================
--- CMF/branches/1.6/CMFDefault/File.py 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/File.py 2006-09-07 10:16:08 UTC (rev 70021)
@@ -26,6 +26,8 @@
from permissions import View
from permissions import ModifyPortalContent
+from zope.interface import implements
+from Products.GenericSetup.interfaces import IDAVAware
factory_type_information = (
{ 'id' : 'File'
@@ -110,6 +112,7 @@
A Portal-managed File
"""
+ implements(IDAVAware)
__implements__ = ( PortalContent.__implements__
, DefaultDublinCoreImpl.__implements__
)
Modified: CMF/branches/1.6/CMFDefault/Image.py
===================================================================
--- CMF/branches/1.6/CMFDefault/Image.py 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/Image.py 2006-09-07 10:16:08 UTC (rev 70021)
@@ -25,6 +25,9 @@
from permissions import View
from permissions import ModifyPortalContent
+from zope.interface import implements
+from Products.GenericSetup.interfaces import IDAVAware
+
factory_type_information = (
{ 'id' : 'Image'
, 'meta_type' : 'Portal Image'
@@ -102,6 +105,7 @@
A Portal-managed Image
"""
+ implements(IDAVAware)
__implements__ = ( PortalContent.__implements__
, DefaultDublinCoreImpl.__implements__
)
Modified: CMF/branches/1.6/CMFDefault/Link.py
===================================================================
--- CMF/branches/1.6/CMFDefault/Link.py 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/Link.py 2006-09-07 10:16:08 UTC (rev 70021)
@@ -38,6 +38,9 @@
from utils import formatRFC822Headers
from utils import parseHeadersBody
+from zope.interface import implements
+from Products.GenericSetup.interfaces import IDAVAware
+
factory_type_information = (
{ 'id' : 'Link'
, 'meta_type' : 'Link'
@@ -90,6 +93,7 @@
A Link
"""
+ implements(IDAVAware)
__implements__ = ( PortalContent.__implements__
, DefaultDublinCoreImpl.__implements__
)
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/export_steps.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/sample_content/export_steps.xml 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/profiles/sample_content/export_steps.xml 2006-09-07 10:16:08 UTC (rev 70021)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<export-steps>
+
+ <export-step id="content"
+ handler="Products.CMFCore.exportimport.exportSiteStructure"
+ title="Content">
+
+
+
+ Export the site's structure and content.
+
+
+
+ </export-step>
+
+</export-steps>
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/export_steps.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/import_steps.xml
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/sample_content/import_steps.xml 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/profiles/sample_content/import_steps.xml 2006-09-07 10:16:08 UTC (rev 70021)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<import-steps>
+
+ <import-step id="content" version="20050927-01"
+ handler="Products.CMFCore.exportimport.importSiteStructure"
+ title="Content">
+ <dependency step="toolset"/>
+ <!-- NYRFPT
+ <dependency step="catalog"/>
+ -->
+ <dependency step="typeinfo"/>
+ <dependency step="workflow"/>
+
+
+
+ Import the site's structure and content.
+
+
+
+ </import-step>
+
+</import-steps>
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/import_steps.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.objects
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.objects 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.objects 2006-09-07 10:16:08 UTC (rev 70021)
@@ -0,0 +1 @@
+subfolder,Folder
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.objects
___________________________________________________________________
Name: svn:eol-style
+ native
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.preserve
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.preserve 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.preserve 2006-09-07 10:16:08 UTC (rev 70021)
@@ -0,0 +1 @@
+Members
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.preserve
___________________________________________________________________
Name: svn:eol-style
+ native
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.properties
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.properties 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.properties 2006-09-07 10:16:08 UTC (rev 70021)
@@ -0,0 +1,4 @@
+[DEFAULT]
+description =
+title = Portal
+
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/.objects
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/.objects 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/.objects 2006-09-07 10:16:08 UTC (rev 70021)
@@ -0,0 +1,6 @@
+html_document,Document
+stx_document,Document
+binary_file.tgz,File
+binary_image.png,Image
+a_link,Link
+some_news,News Item
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/.objects
___________________________________________________________________
Name: svn:eol-style
+ native
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/.properties
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/.properties 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/.properties 2006-09-07 10:16:08 UTC (rev 70021)
@@ -0,0 +1,4 @@
+[DEFAULT]
+description = This is a subfolder.
+title = Sub-Folder
+
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/a_link
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/a_link 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/a_link 2006-09-07 10:16:08 UTC (rev 70021)
@@ -0,0 +1,13 @@
+Title: A Link
+Subject:
+Publisher:
+Description:
+Contributors:
+Effective_date: None
+Expiration_date: 2499-12-31 00:00:00
+Type: Link
+Format: text/url
+Language:
+Rights:
+
+http://palladion.com/
\ No newline at end of file
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/a_link
___________________________________________________________________
Name: svn:eol-style
+ native
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/binary_file.tgz
===================================================================
(Binary files differ)
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/binary_file.tgz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/binary_image.png
===================================================================
(Binary files differ)
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/binary_image.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/html_document
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/html_document 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/html_document 2006-09-07 10:16:08 UTC (rev 70021)
@@ -0,0 +1,17 @@
+<html>
+ <head>
+ <title>HTML Document</title>
+ <meta name="Subject" content="" />
+ <meta name="Publisher" content="" />
+ <meta name="Description" content="" />
+ <meta name="Contributors" content="" />
+ <meta name="Effective_date" content="None" />
+ <meta name="Expiration_date" content="2499-12-31 00:00:00" />
+ <meta name="Type" content="Document" />
+ <meta name="Format" content="text/html" />
+ <meta name="Language" content="" />
+ <meta name="Rights" content="" />
+ <meta name="SafetyBelt" content="1127874889.26" />
+ </head>
+ <body><h1> A Sample HTML Document </h1></body>
+</html>
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/html_document
___________________________________________________________________
Name: svn:eol-style
+ native
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/some_news
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/some_news 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/some_news 2006-09-07 10:16:08 UTC (rev 70021)
@@ -0,0 +1,15 @@
+Title: Some News
+Subject:
+Publisher:
+Description: This is the lead paragraph, which is usually the same as
+ the Dublin Core "Description".
+Contributors:
+Effective_date: None
+Expiration_date: 2499-12-31 00:00:00
+Type: News Item
+Format: text/plain
+Language:
+Rights:
+SafetyBelt: 1127875101.99
+
+The body of the news item goes here.
\ No newline at end of file
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/some_news
___________________________________________________________________
Name: svn:eol-style
+ native
Added: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/stx_document
===================================================================
--- CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/stx_document 2006-09-07 09:08:16 UTC (rev 70020)
+++ CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/stx_document 2006-09-07 10:16:08 UTC (rev 70021)
@@ -0,0 +1,17 @@
+Title: Structured Text Document
+Subject:
+Publisher:
+Description:
+Contributors:
+Effective_date: None
+Expiration_date: 2499-12-31 00:00:00
+Type: Document
+Format: text/plain
+Language:
+Rights:
+SafetyBelt: 1127874919.05
+
+Structured Text for Fun and Profit
+
+ This is a "structured text" document. It uses simple conventions, like those
+ found in plain-text e-mail, to indicate structure and formatting of text.
\ No newline at end of file
Property changes on: CMF/branches/1.6/CMFDefault/profiles/sample_content/structure/subfolder/stx_document
___________________________________________________________________
Name: svn:eol-style
+ native
More information about the CMF-checkins
mailing list