Project: ejabberd

Revision: 1588

Author: badlop

Date: 30 Sep 2008 12:12:05

• /trunk/src/mod_proxy65/Makefile.win32

  ......	@@ -4,8 +4,7 @@
  4	4	EFLAGS = -I .. -pz ..
  5	5
  6	6	OUTDIR = ..
  7		SOURCES = $(wildcard *.erl)
  8		BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
  	7	BEAMS = ..\mod_proxy65.beam ..\mod_proxy65_lib.beam ..\mod_proxy65_service.beam ..\mod_proxy65_sm.beam ..\mod_proxy65_stream.beam
  9	8
  10	9	ALL : $(BEAMS)
  11	10
  ......	@@ -19,7 +18,7 @@
  19	18	erlc -W $(EFLAGS) -o $(OUTDIR) mod_proxy65_service.erl
  20	19
  21	20	$(OUTDIR)\mod_proxy65_sm.beam : mod_proxy65_sm.erl
  22		erlc -W $(EFLAGS) -o $(OUTDIR) mod_mod_proxy65_sm.erl
  	21	erlc -W $(EFLAGS) -o $(OUTDIR) mod_proxy65_sm.erl
  23	22
  24	23	$(OUTDIR)\mod_proxy65_stream.beam : mod_proxy65_stream.erl
  25	24	erlc -W $(EFLAGS) -o $(OUTDIR) mod_proxy65_stream.erl

• /trunk/src/stringprep/Makefile.win32

  ......	@@ -4,8 +4,7 @@
  4	4	EFLAGS = -I .. -pz ..
  5	5
  6	6	OUTDIR = ..
  7		SOURCES = $(wildcard *.erl)
  8		BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
  	7	BEAMS = ..\stringprep.beam ..\stringprep_sup.beam
  9	8
  10	9	SOURCE = stringprep_drv.c
  11	10	AUXIL = uni_data.c uni_norm.c

• /trunk/src/mod_pubsub/Makefile.win32

  ......	@@ -4,8 +4,7 @@
  4	4	EFLAGS = -I .. -pz ..
  5	5
  6	6	OUTDIR = ..
  7		SOURCES = $(wildcard *.erl)
  8		BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
  	7	BEAMS = ..\gen_pubsub_node.beam ..\gen_pubsub_nodetree.beam ..\mod_pubsub.beam ..\nodetree_default.beam ..\nodetree_virtual.beam ..\node_buddy.beam ..\node_club.beam ..\node_default.beam ..\node_dispatch.beam ..\node_pep.beam ..\node_private.beam ..\node_public.beam
  9	8
  10	9	ALL : $(BEAMS)
  11	10
  ......	@@ -27,9 +26,23 @@
  27	26	$(OUTDIR)\nodetree_virtual.beam : nodetree_virtual.erl
  28	27	erlc -W $(EFLAGS) -o $(OUTDIR) nodetree_virtual.erl
  29	28
  	29	$(OUTDIR)\node_buddy.beam : node_buddy.erl
  	30	erlc -W $(EFLAGS) -o $(OUTDIR) node_buddy.erl
  	31
  	32	$(OUTDIR)\node_club.beam : node_club.erl
  	33	erlc -W $(EFLAGS) -o $(OUTDIR) node_club.erl
  	34
  30	35	$(OUTDIR)\node_default.beam : node_default.erl
  31	36	erlc -W $(EFLAGS) -o $(OUTDIR) node_default.erl
  32	37
  	38	$(OUTDIR)\node_dispatch.beam : node_dispatch.erl
  	39	erlc -W $(EFLAGS) -o $(OUTDIR) node_dispatch.erl
  	40
  33	41	$(OUTDIR)\node_pep.beam : node_pep.erl
  34	42	erlc -W $(EFLAGS) -o $(OUTDIR) node_pep.erl
  35	43
  	44	$(OUTDIR)\node_private.beam : node_private.erl
  	45	erlc -W $(EFLAGS) -o $(OUTDIR) node_private.erl
  	46
  	47	$(OUTDIR)\node_public.beam : node_public.erl
  	48	erlc -W $(EFLAGS) -o $(OUTDIR) node_public.erl

• /trunk/doc/guide.html

  ......	@@ -635,7 +635,7 @@
  635	635	Handles incoming s2s connections.<BR>
  636	636	Options: <TT>inet6</TT>, <TT>ip</TT>, <TT>max_stanza_size</TT>
  637	637	</DD><DT CLASS="dt-description"><B><TT>ejabberd_service</TT></B></DT><DD CLASS="dd-description">
  638		Interacts with <A HREF="http://www.ejabberd.im/tutorials-transports">external components</A>
  	638	Interacts with an <A HREF="http://www.ejabberd.im/tutorials-transports">external component</A>
  639	639	(as defined in the Jabber Component Protocol (<A HREF="http://www.xmpp.org/extensions/xep-0114.html">XEP-0114</A>).<BR>
  640	640	Options: <TT>access</TT>, <TT>hosts</TT>, <TT>inet6</TT>,
  641	641	<TT>ip</TT>, <TT>shaper</TT>, <TT>service_check_from</TT>
  ......	@@ -655,9 +655,10 @@
  655	655	external components. The option can be either <TT>true</TT> or
  656	656	<TT>false</TT>. The default value is <TT>true</TT> which conforms to <A HREF="http://www.xmpp.org/extensions/xep-0114.html">XEP-0114</A>.
  657	657	</DD><DT CLASS="dt-description"><B><TT>{hosts, [Hostnames], [HostOptions]}</TT></B></DT><DD CLASS="dd-description">
  658		This option of <TT>ejabberd_service</TT> allows to define one or more hostnames
  659		of external Jabber components that provide a service.
  660		In <TT>HostOptions</TT> it is possible to define the password required to those components
  	658	The external Jabber component that connects to this <TT>ejabberd_service</TT>
  	659	can serve one or more hostnames.
  	660	In <TT>HostOptions</TT> you can define options for the component;
  	661	currently the only allowed option is the password required to the component
  661	662	when attempt to connect to ejabberd: <TT>{password, Secret}</TT>.
  662	663	Note that you cannot define in a single <TT>ejabberd_service</TT> components of
  663	664	different services: add an <TT>ejabberd_service</TT> for each service,
  ......	@@ -2055,7 +2056,9 @@
  2055	2056	status text in presence updates. If disallowed, the <TT>status</TT>
  2056	2057	text is stripped before broadcasting the presence update to all
  2057	2058	the room occupants.
  2058		</DD><DT CLASS="dt-description"><B><TT>{anonymous, true}</TT></B></DT><DD CLASS="dd-description"> Occupants are allowed to see the real JIDs of other occupants.
  	2059	</DD><DT CLASS="dt-description"><B><TT>{anonymous, true}</TT></B></DT><DD CLASS="dd-description"> The room is anonymous:
  	2060	occupants don&#X2019;t see the real JIDs of other occupants.
  	2061	Note that the room moderators can always see the real JIDs of the occupants.
  2059	2062	</DD><DT CLASS="dt-description"><B><TT>{logging, false}</TT></B></DT><DD CLASS="dd-description"> The public messages are logged using <TT>mod_muc_log</TT>.
  2060	2063	</DD><DT CLASS="dt-description"><B><TT>{max_users, 200}</TT></B></DT><DD CLASS="dd-description"> Maximum number of occupants in the room.
  2061	2064	</DD><DT CLASS="dt-description"><B><TT>{members_by_default, true}</TT></B></DT><DD CLASS="dd-description"> The occupants that enter the room are participants by default, so they have &#X2019;voice&#X2019;.
  ......	@@ -3184,11 +3187,15 @@
  3184	3187	<TT>second</TT>.<P>(alt) You can also add &#X2018;<CODE>-cookie content_of_.erlang.cookie</CODE>&#X2019;
  3185	3188	option to all &#X2018;<TT>erl</TT>&#X2019; commands below.</P></LI><LI CLASS="li-enumerate">On <TT>second</TT> run the following command as the <TT>ejabberd</TT> daemon user,
  3186	3189	in the working directory of <TT>ejabberd</TT>:<PRE CLASS="verbatim">erl -sname ejabberd \
  	3190	-mnesia dir "/var/lib/ejabberd/" \
  3187	3191	-mnesia extra_db_nodes "['ejabberd@first']" \
  3188	3192	-s mnesia
  3189	3193	</PRE><P>This will start Mnesia serving the same database as <TT>ejabberd@first</TT>.
  3190	3194	You can check this by running the command &#X2018;<CODE>mnesia:info().</CODE>&#X2019;. You
  3191		should see a lot of remote tables and a line like the following:</P><PRE CLASS="verbatim">running db nodes = [ejabberd@first, ejabberd@second]
  	3195	should see a lot of remote tables and a line like the following:</P><P>Note: the Mnesia directory may be different in your system.
  	3196	To know where does ejabberd expect Mnesia to be installed by default,
  	3197	call <A HREF="#ejabberdctl">4.1</A> without options and it will show some help,
  	3198	including the Mnesia database spool dir.</P><PRE CLASS="verbatim">running db nodes = [ejabberd@first, ejabberd@second]
  3192	3199	</PRE></LI><LI CLASS="li-enumerate">Now run the following in the same &#X2018;<TT>erl</TT>&#X2019; session:<PRE CLASS="verbatim">mnesia:change_table_copy_type(schema, node(), disc_copies).
  3193	3200	</PRE><P>This will create local disc storage for the database.</P><P>(alt) Change storage type of the <TT>scheme</TT> table to &#X2018;RAM and disc
  3194	3201	copy&#X2019; on the second node via the Web Admin.</P></LI><LI CLASS="li-enumerate">Now you can add replicas of various tables to this node with

• /trunk/src/tls/Makefile.win32

  ......	@@ -4,8 +4,7 @@
  4	4	EFLAGS = -I .. -pz ..
  5	5
  6	6	OUTDIR = ..
  7		SOURCES = $(wildcard *.erl)
  8		BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
  	7	BEAMS = ..\tls.beam
  9	8
  10	9	SOURCE = tls_drv.c
  11	10	OBJECT = tls_drv.o

• /trunk/src/odbc/Makefile.win32

  ......	@@ -4,8 +4,7 @@
  4	4	EFLAGS = -I .. -pz ..
  5	5
  6	6	OUTDIR = ..
  7		SOURCES = $(wildcard *.erl)
  8		BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
  	7	BEAMS = ..\ejabberd_odbc.beam ..\ejabberd_odbc_sup.beam ..\odbc_queries.beam
  9	8
  10	9	ALL : $(BEAMS)
  11	10

• /trunk/src/mod_irc/Makefile.win32

  ......	@@ -4,8 +4,7 @@
  4	4	EFLAGS = -I .. -pz ..
  5	5
  6	6	OUTDIR = ..
  7		SOURCES = $(wildcard *.erl)
  8		BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
  	7	BEAMS = ..\iconv.beam ..\mod_irc.beam ..\mod_irc_connection.beam
  9	8
  10	9	SOURCE = iconv_erl.c
  11	10	OBJECT = iconv_erl.o

• /trunk/src/web/Makefile.win32

  ......	@@ -4,8 +4,7 @@
  4	4	EFLAGS = -I .. -pz ..
  5	5
  6	6	OUTDIR = ..
  7		SOURCES = $(wildcard *.erl)
  8		BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
  	7	BEAMS = ..\ejabberd_http.beam ..\ejabberd_http_bind.beam ..\ejabberd_http_poll.beam ..\ejabberd_web.beam ..\ejabberd_web_admin.beam ..\mod_http_bind.beam ..\mod_http_fileserver.beam
  9	8
  10	9	ALL : $(BEAMS)
  11	10
  ......	@@ -21,5 +20,14 @@
  21	20	$(OUTDIR)\ejabberd_web_admin.beam : ejabberd_web_admin.erl
  22	21	erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_web_admin.erl
  23	22
  	23	$(OUTDIR)\ejabberd_http_bind.beam : ejabberd_http_bind.erl
  	24	erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_http_bind.erl
  	25
  24	26	$(OUTDIR)\ejabberd_http_poll.beam : ejabberd_http_poll.erl
  25	27	erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_http_poll.erl
  	28
  	29	$(OUTDIR)\mod_http_bind.beam : mod_http_bind.erl
  	30	erlc -W $(EFLAGS) -o $(OUTDIR) mod_http_bind.erl
  	31
  	32	$(OUTDIR)\mod_http_fileserver.beam : mod_http_fileserver.erl
  	33	erlc -W $(EFLAGS) -o $(OUTDIR) mod_http_fileserver.erl

• /trunk/src/ejabberd_zlib/Makefile.win32

  ......	@@ -4,8 +4,7 @@
  4	4	EFLAGS = -I .. -pz ..
  5	5
  6	6	OUTDIR = ..
  7		SOURCES = $(wildcard *.erl)
  8		BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
  	7	BEAMS = ..\ejabberd_zlib.beam
  9	8
  10	9	SOURCE = ejabberd_zlib_drv.c
  11	10	OBJECT = ejabberd_zlib_drv.o

• /trunk/ChangeLog

  ......	@@ -1,3 +1,9 @@
  	1	2008-09-30 Badlop <badlop@process-one.net>
  	2
  	3	* src/*/Makefile.win32: Provide explicit beam filenames because
  	4	nmake does not accept wildcards (thanks to Attila
  	5	Vangel)(EJAB-543)
  	6
  1	7	2008-09-24 Christophe Romain <christophe.romain@process-one.net>
  2	8
  3	9	* src/mod_pubsub/mod_pubsub.erl: Allow PEP node type to be mapped with

• /trunk/src/mod_muc/Makefile.win32

  ......	@@ -4,8 +4,7 @@
  4	4	EFLAGS = -I .. -pz ..
  5	5
  6	6	OUTDIR = ..
  7		SOURCES = $(wildcard *.erl)
  8		BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
  	7	BEAMS = ..\mod_muc.beam ..\mod_muc_log.beam ..\mod_muc_room.beam
  9	8
  10	9	ALL : $(BEAMS)
  11	10

• /trunk/src/eldap/Makefile.win32

  ......	@@ -4,8 +4,7 @@
  4	4	EFLAGS = -I .. -pz ..
  5	5
  6	6	OUTDIR = ..
  7		SOURCES = $(wildcard *.erl)
  8		BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
  	7	BEAMS = ..\eldap.beam ..\eldap_filter.beam ..\eldap_pool.beam ..\eldap_utils.beam
  9	8
  10	9	ALL : $(BEAMS)
  11	10