enable pep by default and add pubsub plugin examples

SVN Revision: 1031

diff --git a/ChangeLog b/ChangeLog
index fb60c8222904102668d821416324d81f21500add..59f46ab48a08c5c373789904663740f3aa7a843b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-06  Christophe Romain <christophe.romain@process-one.net>
+
+       * src/mod_pubsub/node_dispatch.erl: Correct syntax issue
+       * src/mod_pubsub/Makefile.in: include example plugins
+       * src/mod_pubsub/Makefile.win32: likewise
+       * src/ejabberd.cfg.example: use default and pep pubsub plugins
+       * doc/guide.tex: add nodetree and plugins pubsub option
+       * doc/guite.html: likewise
+
 2007-12-06  Badlop  <badlop@process-one.net>
 
        * doc/guide.tex: Document the Debug Console (EJAB-395)

diff --git a/doc/guide.html b/doc/guide.html
index 11d3981d76a4ee320e1f3a78290130d3bd579efc..ff27013ce3430bb082c5807e035adf96e352b093 100644 (file)
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -2933,7 +2933,14 @@ Options:
  be served, you can use this option. If absent, only the main <TT>ejabberd</TT>
  host is served. <DT CLASS="dt-description"><B><TT>access_createnode</TT></B><DD CLASS="dd-description"> 
  This option restricts which users are allowed to create pubsub nodes using
- ACL and ACCESS. The default value is <TT>pubsub_createnode</TT>. </DL>
+ ACL and ACCESS. The default value is <TT>pubsub_createnode</TT>.
+ 
+<DT CLASS="dt-description"><B><TT>plugins</TT></B><DD CLASS="dd-description"> To specify which pubsub node plugins to use.
+ If not defined, the default plugin is always used.
+
+<DT CLASS="dt-description"><B><TT>nodetree</TT></B><DD CLASS="dd-description"> To specify which nodetree plugin to use.
+ If not defined, the default pubsub nodetree used. Nodetrees are default and virtual. Only one nodetree can be used 
+  and is shared by all node plugins. </DL>
 Example:
 <PRE CLASS="verbatim">
   {modules,
@@ -2941,7 +2948,8 @@ Example:
     ...
     {mod_pubsub, [{served_hosts, ["example.com",
                                   "example.org"]},
-                  {access_createnode, pubsub_createnode}]}
+                  {access_createnode, pubsub_createnode},
+                  {plugins, ["default","pep"]}]}
     ...
    ]}.
 </PRE>

diff --git a/doc/guide.tex b/doc/guide.tex
index 8890d70693e4ba04fb528198b9283371a25b12e4..c24326a78e90f6d4fecebb344006d52d0b89acb2 100644 (file)
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -2653,6 +2653,11 @@ Options:
 \titem{access\_createnode} \ind{options!access\_createnode}
   This option restricts which users are allowed to create pubsub nodes using
   ACL and ACCESS. The default value is \term{pubsub\_createnode}. % Not clear enough + do not use abbreviations.
+\titem{plugins} To specify which pubsub node plugins to use. If not defined, the default
+  pubsub plugin is always used.
+\titem{nodetree} To specify which nodetree to use. If not defined, the default pubsub
+  nodetree is used. Nodetrees are default and virtual. Only one nodetree can be used
+  and is shared by all node plugins. 
 \end{description}
 
 Example:
@@ -2662,7 +2667,8 @@ Example:
     ...
     {mod_pubsub, [{served_hosts, ["example.com",
                                   "example.org"]},
-                  {access_createnode, pubsub_createnode}]}
+                  {access_createnode, pubsub_createnode},
+                  {plugins, ["default","pep"]}]}
     ...
    ]}.
 \end{verbatim}

diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example
index f2e6bdda8c90458c4dfe6a1f0a6ee66a89a35da5..b9f7d332ece190e76d547891b8d343694f41245b 100644 (file)
--- a/src/ejabberd.cfg.example
+++ b/src/ejabberd.cfg.example
@@ -407,7 +407,7 @@
   {mod_privacy,  []},
   {mod_private,  []},
   %%{mod_proxy65,[]},
-  {mod_pubsub,   [{access_createnode, pubsub_createnode}]},
+  {mod_pubsub,   [{access_createnode, pubsub_createnode},{plugins,["default","pep"]}]},
   {mod_register, [
                  %%
                  %% After successful registration, the user receives 

diff --git a/src/mod_pubsub/Makefile.in b/src/mod_pubsub/Makefile.in
index f23796eb5c701d748dece404ef3acd344292d035..8648b9489d6a6fd8defcd3d8753b5d630c59c496 100644 (file)
--- a/src/mod_pubsub/Makefile.in
+++ b/src/mod_pubsub/Makefile.in
@@ -25,7 +25,12 @@ OBJS   = \
        $(OUTDIR)/nodetree_virtual.beam \
        $(OUTDIR)/mod_pubsub.beam \
        $(OUTDIR)/node_default.beam \
-       $(OUTDIR)/node_pep.beam 
+       $(OUTDIR)/node_pep.beam \
+       $(OUTDIR)/node_buddy.beam \
+       $(OUTDIR)/node_club.beam \
+       $(OUTDIR)/node_dispatch.beam \
+       $(OUTDIR)/node_private.beam \
+       $(OUTDIR)/node_public.beam
 
 all:    $(OBJS)
 

diff --git a/src/mod_pubsub/Makefile.win32 b/src/mod_pubsub/Makefile.win32
index d1680bb1140f3fb02e2ad0845886b2e77ced4a76..8d4e9f99331c56b34b485a328a138c7bf2193aae 100644 (file)
--- a/src/mod_pubsub/Makefile.win32
+++ b/src/mod_pubsub/Makefile.win32
@@ -11,7 +11,12 @@ OBJS = \
        $(OUTDIR)/nodetree_virtual.beam \
        $(OUTDIR)/mod_pubsub.beam \
        $(OUTDIR)/node_default.beam \
-       $(OUTDIR)/node_pep.beam 
+       $(OUTDIR)/node_pep.beam \
+       $(OUTDIR)/node_buddy.beam \
+       $(OUTDIR)/node_club.beam \
+       $(OUTDIR)/node_dispatch.beam \
+       $(OUTDIR)/node_private.beam \
+       $(OUTDIR)/node_public.beam
 
 ALL : $(OBJS)
 

diff --git a/src/mod_pubsub/node_dispatch.erl b/src/mod_pubsub/node_dispatch.erl
index e0b9d02775e94a636bad78b4058fe8bfc8bc3084..7c73413693d3b2b076c90df29a96a286bb507d6d 100644 (file)
--- a/src/mod_pubsub/node_dispatch.erl
+++ b/src/mod_pubsub/node_dispatch.erl
@@ -85,7 +85,7 @@ features() ->
      %%"purge-nodes",
      %%"retract-items",
      %%"retrieve-affiliations",
-     "retrieve-items",
+     "retrieve-items"
      %%"retrieve-subscriptions",
      %%"subscribe",
      %%"subscription-notifications",
@@ -115,7 +115,7 @@ publish_item(Host, Node, Publisher, Model, MaxItems, ItemId, Payload) ->
                  end, nodetree_default:get_subnodes(Host, Node)).
 
 remove_extra_items(_Host, _Node, _MaxItems, ItemIds) ->
-    {result, {ItemsIds, []}}.
+    {result, {ItemIds, []}}.
 
 delete_item(_Host, _Node, _JID, _ItemId) ->
     {error, ?ERR_ITEM_NOT_FOUND}.