diff -Nru --exclude=*.svn --exclude=*.pyc PloneSurvey/config.py /home/kaeru/zope210/plone3/Products/PloneSurvey/config.py
--- PloneSurvey/config.py	Wed Aug 29 13:14:38 2007
+++ /home/kaeru/zope210/plone3/Products/PloneSurvey/config.py	Wed Aug 29 11:43:24 2007
@@ -1,9 +1,9 @@
-from Products.CMFCore import permissions
+from Products.CMFCore import permissions as CMFCorePermissions
 from Products.Archetypes.utils import DisplayList
 from Products.Archetypes.utils import IntDisplayList
 from Products.validation import validation
 
-ADD_CONTENT_PERMISSION = permissions.AddPortalContent
+ADD_CONTENT_PERMISSION = CMFCorePermissions.AddPortalContent
 PROJECTNAME = "PloneSurvey"
 SKINS_DIR = 'skins'
 
diff -Nru --exclude=*.svn --exclude=*.pyc PloneSurvey/content/SubSurvey.py /home/kaeru/zope210/plone3/Products/PloneSurvey/content/SubSurvey.py
--- PloneSurvey/content/SubSurvey.py	Wed Aug 29 13:14:38 2007
+++ /home/kaeru/zope210/plone3/Products/PloneSurvey/content/SubSurvey.py	Wed Aug 29 12:47:27 2007
@@ -71,12 +71,6 @@
     'action' : 'string:${object_url}/aq_parent/survey_overview',
     'permissions' : (permissions.ModifyPortalContent, )
     },
-    {
-    'id' : 'sharing',
-    'name' : 'Sharing',
-    'action' : 'string:${object_url}/folder_localrole_form',
-    'permissions' : (permissions.ManageProperties, )
-    },
 )
 
 finalizeATCTSchema(schema, moveDiscussion=False)
diff -Nru --exclude=*.svn --exclude=*.pyc PloneSurvey/content/Survey.py /home/kaeru/zope210/plone3/Products/PloneSurvey/content/Survey.py
--- PloneSurvey/content/Survey.py	Wed Aug 29 13:14:38 2007
+++ /home/kaeru/zope210/plone3/Products/PloneSurvey/content/Survey.py	Wed Aug 29 12:47:27 2007
@@ -175,12 +175,6 @@
     'action' : 'string:${object_url}/survey_overview',
     'permissions' : (permissions.ModifyPortalContent, )
     },
-    {
-    'id' : 'sharing',
-    'name' : 'Sharing',
-    'action' : 'string:${object_url}/folder_localrole_form',
-    'permissions' : (permissions.ManageProperties, )
-    },
 )
 
 finalizeATCTSchema(schema, moveDiscussion=False)
diff -Nru --exclude=*.svn --exclude=*.pyc PloneSurvey/permissions.py /home/kaeru/zope210/plone3/Products/PloneSurvey/permissions.py
--- PloneSurvey/permissions.py	Wed Aug 29 13:14:38 2007
+++ /home/kaeru/zope210/plone3/Products/PloneSurvey/permissions.py	Wed Aug 29 11:34:57 2007
@@ -1,5 +1,4 @@
 from Products.CMFCore.permissions import setDefaultRoles
-
 from Products.CMFCore.permissions import View
 from Products.CMFCore.permissions import ModifyPortalContent
 from Products.CMFCore.permissions import AddPortalContent
diff -Nru --exclude=*.svn --exclude=*.pyc PloneSurvey/profiles/default/types/Sub_Survey.xml /home/kaeru/zope210/plone3/Products/PloneSurvey/profiles/default/types/Sub_Survey.xml
--- PloneSurvey/profiles/default/types/Sub_Survey.xml	Wed Aug 29 13:14:32 2007
+++ /home/kaeru/zope210/plone3/Products/PloneSurvey/profiles/default/types/Sub_Survey.xml	Wed Aug 29 12:47:27 2007
@@ -26,7 +26,6 @@
  <alias from="edit" to="atct_edit"/>
  <alias from="index.html" to="(dynamic view)"/>
  <alias from="properties" to="base_metadata"/>
- <alias from="sharing" to="folder_localrole_form"/>
  <alias from="view" to="(selected layout)"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     url_expr="string:${object_url}" visible="True">
@@ -57,10 +56,6 @@
     url_expr="string:${object_url}/external_edit" visible="False">
   <permission value="Modify portal content"/>
  </action>
- <action title="Sharing" action_id="local_roles" category="object"
-    condition_expr="" url_expr="string:${object_url}/sharing" visible="True">
-  <permission value="Manage properties"/>
- </action>
  <action title="State" action_id="content_status_history"
     category="object_tabs"
     condition_expr="python:object and portal.portal_workflow.getTransitionsFor(object, object.getParentNode())"
@@ -73,4 +68,4 @@
     url_expr="string:$object_url/survey_overview" visible="True">
   <permission value="ModifyPortalContent"/>
  </action>
-</object>
\ No newline at end of file
+</object>
diff -Nru --exclude=*.svn --exclude=*.pyc PloneSurvey/profiles/default/types/Survey.xml /home/kaeru/zope210/plone3/Products/PloneSurvey/profiles/default/types/Survey.xml
--- PloneSurvey/profiles/default/types/Survey.xml	Wed Aug 29 13:14:32 2007
+++ /home/kaeru/zope210/plone3/Products/PloneSurvey/profiles/default/types/Survey.xml	Wed Aug 29 12:47:27 2007
@@ -27,7 +27,6 @@
  <alias from="edit" to="atct_edit"/>
  <alias from="index.html" to="(dynamic view)"/>
  <alias from="properties" to="base_metadata"/>
- <alias from="sharing" to="folder_localrole_form"/>
  <alias from="view" to="(selected layout)"/>
  <alias from="results" to="survey_view_results"/>
  <alias from="reset" to="survey_reset_form"/>
@@ -61,10 +60,6 @@
     url_expr="string:${object_url}/external_edit" visible="False">
   <permission value="Modify portal content"/>
  </action>
- <action title="Sharing" action_id="local_roles" category="object"
-    condition_expr="" url_expr="string:${object_url}/sharing" visible="True">
-  <permission value="Manage properties"/>
- </action>
  <action title="State" action_id="content_status_history"
     category="object_tabs"
     condition_expr="python:object and portal.portal_workflow.getTransitionsFor(object, object.getParentNode())"
@@ -89,4 +84,4 @@
     url_expr="string:$object_url/survey_overview" visible="True">
   <permission value="ModifyPortalContent"/>
  </action>
-</object>
\ No newline at end of file
+</object>
diff -Nru --exclude=*.svn --exclude=*.pyc PloneSurvey/profiles/default/types/Survey_Matrix.xml /home/kaeru/zope210/plone3/Products/PloneSurvey/profiles/default/types/Survey_Matrix.xml
--- PloneSurvey/profiles/default/types/Survey_Matrix.xml	Wed Aug 29 13:14:32 2007
+++ /home/kaeru/zope210/plone3/Products/PloneSurvey/profiles/default/types/Survey_Matrix.xml	Wed Aug 29 12:47:27 2007
@@ -24,7 +24,6 @@
  <alias from="edit" to="atct_edit"/>
  <alias from="index.html" to="(dynamic view)"/>
  <alias from="properties" to="base_metadata"/>
- <alias from="sharing" to="folder_localrole_form"/>
  <alias from="view" to="(selected layout)"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     url_expr="string:${object_url}" visible="True">
@@ -55,14 +54,10 @@
     url_expr="string:${object_url}/external_edit" visible="False">
   <permission value="Modify portal content"/>
  </action>
- <action title="Sharing" action_id="local_roles" category="object"
-    condition_expr="" url_expr="string:${object_url}/sharing" visible="True">
-  <permission value="Manage properties"/>
- </action>
  <action title="State" action_id="content_status_history"
     category="object_tabs"
     condition_expr="python:object and portal.portal_workflow.getTransitionsFor(object, object.getParentNode())"
     url_expr="string:$object_url/content_status_history" visible="False">
   <permission value="View"/>
  </action>
-</object>
\ No newline at end of file
+</object>
diff -Nru --exclude=*.svn --exclude=*.pyc PloneSurvey/profiles/default/types/Survey_Matrix_Question.xml /home/kaeru/zope210/plone3/Products/PloneSurvey/profiles/default/types/Survey_Matrix_Question.xml
--- PloneSurvey/profiles/default/types/Survey_Matrix_Question.xml	Wed Aug 29 13:14:32 2007
+++ /home/kaeru/zope210/plone3/Products/PloneSurvey/profiles/default/types/Survey_Matrix_Question.xml	Wed Aug 29 12:47:27 2007
@@ -22,7 +22,6 @@
  <alias from="edit" to="atct_edit"/>
  <alias from="index.html" to="(dynamic view)"/>
  <alias from="properties" to="base_metadata"/>
- <alias from="sharing" to="folder_localrole_form"/>
  <alias from="view" to="(selected layout)"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     url_expr="string:${object_url}" visible="True">
@@ -53,14 +52,10 @@
     url_expr="string:${object_url}/external_edit" visible="False">
   <permission value="Modify portal content"/>
  </action>
- <action title="Sharing" action_id="local_roles" category="object"
-    condition_expr="" url_expr="string:${object_url}/sharing" visible="True">
-  <permission value="Manage properties"/>
- </action>
  <action title="State" action_id="content_status_history"
     category="object_tabs"
     condition_expr="python:object and portal.portal_workflow.getTransitionsFor(object, object.getParentNode())"
     url_expr="string:$object_url/content_status_history" visible="False">
   <permission value="View"/>
  </action>
-</object>
\ No newline at end of file
+</object>
diff -Nru --exclude=*.svn --exclude=*.pyc PloneSurvey/profiles/default/types/Survey_Select_Question.xml /home/kaeru/zope210/plone3/Products/PloneSurvey/profiles/default/types/Survey_Select_Question.xml
--- PloneSurvey/profiles/default/types/Survey_Select_Question.xml	Wed Aug 29 13:14:32 2007
+++ /home/kaeru/zope210/plone3/Products/PloneSurvey/profiles/default/types/Survey_Select_Question.xml	Wed Aug 29 12:47:27 2007
@@ -22,7 +22,6 @@
  <alias from="edit" to="atct_edit"/>
  <alias from="index.html" to="(dynamic view)"/>
  <alias from="properties" to="base_metadata"/>
- <alias from="sharing" to="folder_localrole_form"/>
  <alias from="view" to="(selected layout)"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     url_expr="string:${object_url}" visible="True">
@@ -53,14 +52,10 @@
     url_expr="string:${object_url}/external_edit" visible="False">
   <permission value="Modify portal content"/>
  </action>
- <action title="Sharing" action_id="local_roles" category="object"
-    condition_expr="" url_expr="string:${object_url}/sharing" visible="True">
-  <permission value="Manage properties"/>
- </action>
  <action title="State" action_id="content_status_history"
     category="object_tabs"
     condition_expr="python:object and portal.portal_workflow.getTransitionsFor(object, object.getParentNode())"
     url_expr="string:$object_url/content_status_history" visible="False">
   <permission value="View"/>
  </action>
-</object>
\ No newline at end of file
+</object>
diff -Nru --exclude=*.svn --exclude=*.pyc PloneSurvey/profiles/default/types/Survey_Text_Question.xml /home/kaeru/zope210/plone3/Products/PloneSurvey/profiles/default/types/Survey_Text_Question.xml
--- PloneSurvey/profiles/default/types/Survey_Text_Question.xml	Wed Aug 29 13:14:32 2007
+++ /home/kaeru/zope210/plone3/Products/PloneSurvey/profiles/default/types/Survey_Text_Question.xml	Wed Aug 29 12:47:27 2007
@@ -22,7 +22,6 @@
  <alias from="edit" to="atct_edit"/>
  <alias from="index.html" to="(dynamic view)"/>
  <alias from="properties" to="base_metadata"/>
- <alias from="sharing" to="folder_localrole_form"/>
  <alias from="view" to="(selected layout)"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     url_expr="string:${object_url}" visible="True">
@@ -53,14 +52,10 @@
     url_expr="string:${object_url}/external_edit" visible="False">
   <permission value="Modify portal content"/>
  </action>
- <action title="Sharing" action_id="local_roles" category="object"
-    condition_expr="" url_expr="string:${object_url}/sharing" visible="True">
-  <permission value="Manage properties"/>
- </action>
  <action title="State" action_id="content_status_history"
     category="object_tabs"
     condition_expr="python:object and portal.portal_workflow.getTransitionsFor(object, object.getParentNode())"
     url_expr="string:$object_url/content_status_history" visible="False">
   <permission value="View"/>
  </action>
-</object>
\ No newline at end of file
+</object>
diff -Nru --exclude=*.svn --exclude=*.pyc PloneSurvey/tests/pstc.py /home/kaeru/zope210/plone3/Products/PloneSurvey/tests/pstc.py
--- PloneSurvey/tests/pstc.py	Wed Aug 29 13:14:37 2007
+++ /home/kaeru/zope210/plone3/Products/PloneSurvey/tests/pstc.py	Wed Aug 29 11:34:57 2007
@@ -47,4 +47,4 @@
         self.app.REQUEST['SESSION'] = self.Session()
 
     # You may wish to define additional helper methods
-    # here that will be available in all tests.
\ No newline at end of file
+    # here that will be available in all tests.