You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by be...@apache.org on 2013/07/02 16:58:37 UTC
[2/3] git commit: add new configuration properties to
spring-config.xml, add comments
add new configuration properties to spring-config.xml, add comments
Project: http://git-wip-us.apache.org/repos/asf/mina-vysper/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-vysper/commit/28ca5c58
Tree: http://git-wip-us.apache.org/repos/asf/mina-vysper/tree/28ca5c58
Diff: http://git-wip-us.apache.org/repos/asf/mina-vysper/diff/28ca5c58
Branch: refs/heads/master
Commit: 28ca5c5835cd8906259c02f0c3161e880a4bd790
Parents: 4e99c84
Author: Bernd Fondermann <be...@brainlounge.de>
Authored: Tue Jul 2 16:47:29 2013 +0200
Committer: Bernd Fondermann <be...@brainlounge.de>
Committed: Tue Jul 2 16:47:29 2013 +0200
----------------------------------------------------------------------
server/core/src/main/config/spring-config.xml | 27 ++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-vysper/blob/28ca5c58/server/core/src/main/config/spring-config.xml
----------------------------------------------------------------------
diff --git a/server/core/src/main/config/spring-config.xml b/server/core/src/main/config/spring-config.xml
index 3dcfbfa..127a13e 100644
--- a/server/core/src/main/config/spring-config.xml
+++ b/server/core/src/main/config/spring-config.xml
@@ -59,7 +59,13 @@
<property name="contextPath" value="/bosh" />
</bean>
-->
+
+ <bean id="s2sEndpoint" class="org.apache.vysper.mina.S2SEndpoint">
+ </bean>
+ <!--
+ main server configuration, all is coming together here:
+ -->
<bean id="server" class="org.apache.vysper.spring.SpringCompatibleXMPPServer"
init-method="init" destroy-method="destroy">
<!-- TODO change domain name to your domain -->
@@ -67,12 +73,25 @@
<property name="endpoints">
<list>
<ref bean="tcpEndpoint"/>
- <!--<ref bean="boshEndpoint"/>-->
+ <!--<ref bean="boshEndpoint"/>--><!-- enables a BOSH endpoint -->
+ <!--<ref bean="s2sEndpoint"/>--><!-- enables a server-to-server endpoint -->
</list>
</property>
+ <!-- choose the kind of persistent storage which is used -->
<property name="storageProviderRegistry" ref="storageRegistry" />
+ <!-- TLS certificate for this server -->
<property name="certificateFile" value="classpath:bogus_mina_tls.cert" />
+ <!-- TLS certificate secret matching the given certificate -->
<property name="certificatePassword" value="boguspw" />
+ <!-- enable server-to-server federation -->
+ <property name="enableFederationFeature" value="false"/>
+ <!-- disable strict checks on remote server certificates (not recommended) -->
+ <property name="disableFederationServerCertificateChecks" value="false"/>
+ <!--<property name="SASLMechanisms">
+ <list>
+ </list>
+ </property>-->
+ <!-- extension modules -->
<property name="modules" >
<list>
<bean class="org.apache.vysper.xmpp.modules.extension.xep0092_software_version.SoftwareVersionModule"/>
@@ -86,11 +105,11 @@
<list><value>admin@vysper.org</value></list>
</property>
</bean>
- <!-- below some more modules which are available as separately-built jars.
- make sure they are on the classpath when enabling them or remove the beans below,
+ <!-- below some more modules which are available as separately-built JARs.
+ make sure these JARs are on the classpath when enabling the modules or remove the beans below,
depending on the features your server should expose -->
<!--<bean class="org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.PublishSubscribeModule" />-->
- <bean class="org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCModule" />
+ <!--<bean class="org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCModule" />-->
</list>
</property>
</bean>