[Zope3-checkins] CVS: Zope3/src/zope/app/content - configure.zcml:1.5 file.py:1.3 zpt.py:1.4

[Steve Alexander]

Update of /cvs-repository/Zope3/src/zope/app/content
In directory cvs.zope.org:/tmp/cvs-serv912/src/zope/app/content

Modified Files:
	configure.zcml file.py zpt.py 
Log Message:
Compressed various independent modules in zope.app.traversing into 
far fewer modules.
Also, changed the place where the textindex lives to one level higher.


=== Zope3/src/zope/app/content/configure.zcml 1.4 => 1.5 ===
--- Zope3/src/zope/app/content/configure.zcml:1.4	Fri Dec 27 15:33:49 2002
+++ Zope3/src/zope/app/content/configure.zcml	Sat Dec 28 12:49:25 2002
@@ -151,7 +151,7 @@
 </content>
 
 <adapter factory="zope.app.content.zpt.SearchableText"
-         provides="zope.app.interfaces.index.text.interfaces.ISearchableText"
+         provides="zope.app.interfaces.index.text.ISearchableText"
          for="zope.app.interfaces.content.zpt.IZPTPage" />
 
 <adapter factory="zope.app.content.zpt.Sized"
@@ -233,7 +233,7 @@
 </content>
 
 <adapter factory="zope.app.content.file.SearchableText"
-         provides="zope.app.interfaces.index.text.interfaces.ISearchableText"
+         provides="zope.app.interfaces.index.text.ISearchableText"
          for="zope.app.interfaces.content.file.IReadFile" />
 
 <!-- SQL Script Directives -->


=== Zope3/src/zope/app/content/file.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/content/file.py:1.2	Wed Dec 25 09:12:48 2002
+++ Zope3/src/zope/app/content/file.py	Sat Dec 28 12:49:25 2002
@@ -179,7 +179,7 @@
 
 # Adapter for ISearchableText
 
-from zope.app.interfaces.index.text.interfaces import ISearchableText
+from zope.app.interfaces.index.text import ISearchableText
 
 class SearchableText:
 


=== Zope3/src/zope/app/content/zpt.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/content/zpt.py:1.3	Fri Dec 27 15:33:49 2002
+++ Zope3/src/zope/app/content/zpt.py	Sat Dec 28 12:49:25 2002
@@ -25,7 +25,7 @@
 
 from zope.pagetemplate.pagetemplate import PageTemplate
 from zope.app.pagetemplate.engine import AppPT
-from zope.app.interfaces.index.text.interfaces import ISearchableText
+from zope.app.interfaces.index.text import ISearchableText
 from zope.app.interfaces.size import ISized
 from zope.app.interfaces.content.zpt import IZPTPage, IRenderZPTPage