[Checkins] SVN: zopeorg.deployment/trunk/ Cleanups, installation steps

[Wichert Akkerman]

Log message for revision 82792:
  Cleanups, installation steps

Changed:
  U   zopeorg.deployment/trunk/setup.py
  U   zopeorg.deployment/trunk/zopeorg/deployment/__init__.py
  U   zopeorg.deployment/trunk/zopeorg/deployment/configure.zcml
  U   zopeorg.deployment/trunk/zopeorg/deployment/profiles/content/import_steps.xml
  A   zopeorg.deployment/trunk/zopeorg/deployment/profiles/content/zopeorg.deployment-content.txt
  A   zopeorg.deployment/trunk/zopeorg/deployment/profiles/default/import_steps.xml
  A   zopeorg.deployment/trunk/zopeorg/deployment/profiles/default/zopeorg.deployment-default.txt
  U   zopeorg.deployment/trunk/zopeorg/deployment/setuphandlers/content.py

-=-
Modified: zopeorg.deployment/trunk/setup.py
===================================================================
--- zopeorg.deployment/trunk/setup.py	2008-01-11 00:10:09 UTC (rev 82791)
+++ zopeorg.deployment/trunk/setup.py	2008-01-11 00:26:09 UTC (rev 82792)
@@ -24,7 +24,7 @@
       zip_safe=False,
       install_requires=[
           'setuptools',
-          zopeorg.theme
+          "zopeorg.theme",
       ],
       entry_points="""
       # -*- Entry points: -*-

Modified: zopeorg.deployment/trunk/zopeorg/deployment/__init__.py
===================================================================
--- zopeorg.deployment/trunk/zopeorg/deployment/__init__.py	2008-01-11 00:10:09 UTC (rev 82791)
+++ zopeorg.deployment/trunk/zopeorg/deployment/__init__.py	2008-01-11 00:26:09 UTC (rev 82792)
@@ -1,4 +1 @@
 #
-
-def initialize(context):
-    """Initializer called when used as a Zope 2 product."""

Modified: zopeorg.deployment/trunk/zopeorg/deployment/configure.zcml
===================================================================
--- zopeorg.deployment/trunk/zopeorg/deployment/configure.zcml	2008-01-11 00:10:09 UTC (rev 82791)
+++ zopeorg.deployment/trunk/zopeorg/deployment/configure.zcml	2008-01-11 00:26:09 UTC (rev 82792)
@@ -1,18 +1,20 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:five="http://namespaces.zope.org/five"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     i18n_domain="zopeorg.deployment">
 
-    <five:registerPackage package="." initialize=".initialize" />
+  <five:registerPackage package="." />
 
-    <include package="zopeorg.theme" />
+  <include package="zopeorg.theme" />
 
   <genericsetup:registerProfile
       name="default"
-      title="Zope.org site configuration"
+      title="Zope.org configuration"
       description="Zope.org CIDC site configuration"
       directory="profiles/default"
       provides="Products.GenericSetup.interfaces.EXTENSION"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
       />
 
   <genericsetup:registerProfile
@@ -21,6 +23,7 @@
       description="Create the initial content and site structure"
       directory="profiles/content"
       provides="Products.GenericSetup.interfaces.EXTENSION"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
       />
 
 </configure>

Modified: zopeorg.deployment/trunk/zopeorg/deployment/profiles/content/import_steps.xml
===================================================================
--- zopeorg.deployment/trunk/zopeorg/deployment/profiles/content/import_steps.xml	2008-01-11 00:10:09 UTC (rev 82791)
+++ zopeorg.deployment/trunk/zopeorg/deployment/profiles/content/import_steps.xml	2008-01-11 00:26:09 UTC (rev 82792)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <import-steps>
-  <import-step id="zopeorg_various"
+  <import-step id="zopeorg.deployment-content"
                version="20070323-01"
                handler="zopeorg.deployment.setuphandlers.content.importVarious"
                title="Configure zope.org content">

Added: zopeorg.deployment/trunk/zopeorg/deployment/profiles/content/zopeorg.deployment-content.txt
===================================================================
--- zopeorg.deployment/trunk/zopeorg/deployment/profiles/content/zopeorg.deployment-content.txt	                        (rev 0)
+++ zopeorg.deployment/trunk/zopeorg/deployment/profiles/content/zopeorg.deployment-content.txt	2008-01-11 00:26:09 UTC (rev 82792)
@@ -0,0 +1 @@
+Yes, go right ahead!


Property changes on: zopeorg.deployment/trunk/zopeorg/deployment/profiles/content/zopeorg.deployment-content.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: zopeorg.deployment/trunk/zopeorg/deployment/profiles/default/import_steps.xml
===================================================================
--- zopeorg.deployment/trunk/zopeorg/deployment/profiles/default/import_steps.xml	                        (rev 0)
+++ zopeorg.deployment/trunk/zopeorg/deployment/profiles/default/import_steps.xml	2008-01-11 00:26:09 UTC (rev 82792)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<import-steps>
+  <import-step id="zopeorg.deployment-default"
+               version="20070323-01"
+               handler="zopeorg.deployment.setuphandlers.default.importVarious"
+               title="Configure zope.org site">
+     Put the finishing touches on the zope.org site configuration.
+    <dependency step="toolset"/>
+  </import-step>
+</import-steps>


Property changes on: zopeorg.deployment/trunk/zopeorg/deployment/profiles/default/import_steps.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Added: zopeorg.deployment/trunk/zopeorg/deployment/profiles/default/zopeorg.deployment-default.txt
===================================================================
--- zopeorg.deployment/trunk/zopeorg/deployment/profiles/default/zopeorg.deployment-default.txt	                        (rev 0)
+++ zopeorg.deployment/trunk/zopeorg/deployment/profiles/default/zopeorg.deployment-default.txt	2008-01-11 00:26:09 UTC (rev 82792)
@@ -0,0 +1 @@
+Yes, go right ahead!


Property changes on: zopeorg.deployment/trunk/zopeorg/deployment/profiles/default/zopeorg.deployment-default.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: zopeorg.deployment/trunk/zopeorg/deployment/setuphandlers/content.py
===================================================================
--- zopeorg.deployment/trunk/zopeorg/deployment/setuphandlers/content.py	2008-01-11 00:10:09 UTC (rev 82791)
+++ zopeorg.deployment/trunk/zopeorg/deployment/setuphandlers/content.py	2008-01-11 00:26:09 UTC (rev 82792)
@@ -1,14 +1,15 @@
+from Products.CMFCore.utils import getToolByName
 
 def importVarious(context):
+    if context.readDataFile("zopeorg.deployment-content.txt") is None:
+        return
+
     logger=context.getLogger("zopeorg.deployment")
     site=context.getSite()
     recatalog(context, logger)
 
 
 def recatalog(context, logger):
-    if context.readDataFile("zopeorg-various.txt") is None:
-        return
-
     site=context.getSite()
     ct=getToolByName(site, "portal_catalog")
     ct.refreshCatalog()