[Zope3-checkins] CVS: zopeproducts/zwiki - configure.zcml:1.23 interfaces.py:1.10 wikipage.py:1.8 meta.zcml:NONE metaconfigure.py:NONE sourcetype.py:NONE

[Stephan Richter]

Update of /cvs-repository/zopeproducts/zwiki
In directory cvs.zope.org:/tmp/cvs-serv11207

Modified Files:
	configure.zcml interfaces.py wikipage.py 
Removed Files:
	meta.zcml metaconfigure.py sourcetype.py 
Log Message:
Now that the renderer code moved to the core, we can remove it from here.


=== zopeproducts/zwiki/configure.zcml 1.22 => 1.23 ===
--- zopeproducts/zwiki/configure.zcml:1.22	Sat Jul  5 16:50:49 2003
+++ zopeproducts/zwiki/configure.zcml	Thu Jul 31 14:00:48 2003
@@ -3,9 +3,6 @@
    xmlns:event="http://namespaces.zope.org/event"
    xmlns:translate="http://namespaces.zope.org/gts">
 
-  <!-- Register wiki ZCML namespace directives -->
-  <include file="meta.zcml" />
-
   <!-- Security definitions -->
 
   <role
@@ -192,17 +189,6 @@
      permission="zopeproducts.zwiki.EditWikiPage"
      />
 
-  <!-- Wiki-specifc configuration -->
-
-  <serviceType 
-      id="WikiSourceTypeRegistry"
-      interface=".interfaces.IWikiSourceTypeService" />
-
-  <service 
-      serviceType="WikiSourceTypeRegistry"
-      permission="zopeproducts.zwiki.ViewWikiPage"
-      component=".sourcetype.SourceTypes" />
-
   <!-- Wiki Index registration -->
 
   <content class=".index.WikiTextIndex">
@@ -231,9 +217,6 @@
                    zope.app.interfaces.event.IObjectRemovedEvent
                    zope.app.interfaces.event.IObjectMovedEvent" />
 
-
-  <!-- Register the various renderers, like plain text, stx, and rest -->  
-  <include package=".renderer" />
 
   <!-- Register various browser related components, including all views -->
   <include package=".browser" />


=== zopeproducts/zwiki/interfaces.py 1.9 => 1.10 ===
--- zopeproducts/zwiki/interfaces.py:1.9	Tue Jul 15 11:06:31 2003
+++ zopeproducts/zwiki/interfaces.py	Thu Jul 31 14:00:48 2003
@@ -48,7 +48,7 @@
     type = TextLine(
         title=_(u"Source Type"),
         description=_(u"Type of the source text, e.g. structured text"),
-        default=u"Plain Text",
+        default=u"reStructured Text (reST)",
         required=True)
 
     def append(source):
@@ -114,76 +114,3 @@
         """Remove a set of subscriptions."""
         
 
-class IWikiSourceTypeService(Interface):
-    """ """
-
-    def get(title, default=None):
-        """Get the type interface by title. If the type was not found, return
-        default."""
-
-    def query(title):
-        """Get the type interface by title. Throw an error, if not found."""
-
-    def getAllTitles():
-        """Return a list of all titles."""
-
-    def createObject(title):
-        """Creates an object that implements the interface (note these are
-        just marker interfaces, so the object is minimal) that is registered
-        with the title passed."""
-
-
-class IGlobalWikiSourceTypeService(IWikiSourceTypeService):
-    """Adds some write methods to the service, so that we can reguster new
-    source types."""
-
-    def provide(title, iface):
-        """The title is the description of the source type and the interface
-        is used to recognize the type."""
-
-
-class ISource(Interface):
-    """Simple base interface for all possible Wiki Page Source types."""
-
-    def createComment(comment, number):
-        """Create a comment from the comment content and the number of the
-        comment.
-
-        Various source types want to create comments in various different
-        ways. This method allows us to specify a way to create comments for
-        every different source type.
-        """
-
-class IPlainTextSource(ISource):
-    """Marker interface for a plain text source. Note that an implementation
-    of this interface should always derive from unicode or behave like a
-    unicode class."""
-
-
-class IStructuredTextSource(ISource):
-    """Marker interface for a structured text source. Note that an
-    implementation of this interface should always derive from unicode or
-    behave like a unicode class."""
-
-
-class IReStructuredTextSource(ISource):
-    """Marker interface for a restructured text source. Note that an
-    implementation of this interface should always derive from unicode or
-    behave like a unicode class."""
-
-
-class ISourceRenderer(Interface):
-    """Objecrt implementing this interface are responsible for rendering an
-    ISource objects to an output format. This is the base class for all
-    possible output types."""
-
-    def render(context):
-        """Renders the source into another format.
-
-        The context argument is passed, since some rendering might require
-        some knowledge about the environment. If this turns out to be
-        unnecessary, we can remove this attribute later."""
-        
-
-class IHTMLRenderer(ISourceRenderer):
-    """Renders an ISource object to HTML."""


=== zopeproducts/zwiki/wikipage.py 1.7 => 1.8 ===
--- zopeproducts/zwiki/wikipage.py:1.7	Mon Jun 23 17:46:49 2003
+++ zopeproducts/zwiki/wikipage.py	Thu Jul 31 14:00:48 2003
@@ -49,7 +49,7 @@
     source = u''
     
     # See zopeproducts.zwiki.interfaces.IWikiPage
-    type = u'Plain Text'
+    type = u'reStructured Text (reST)'
 
     def __init__(self):
         self.__comments = 1

=== Removed File zopeproducts/zwiki/meta.zcml ===

=== Removed File zopeproducts/zwiki/metaconfigure.py ===

=== Removed File zopeproducts/zwiki/sourcetype.py ===