Author: niklas
Date: Fri Dec 1 00:52:07 2006
New Revision: 481187
URL: http://svn.apache.org/viewvc?view=rev&rev=481187
Log:
Updated Spring config file for Chat example according to recent changes in the
API. Removed jmxContext.xml since it has been merged into serverContext.xml
Removed:
mina/trunk/example/src/main/java/org/apache/mina/example/chat/jmxContext.xml
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/chat/SpringMain.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/serverContext.xml
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/chat/SpringMain.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/SpringMain.java?view=diff&rev=481187&r1=481186&r2=481187
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/chat/SpringMain.java
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/chat/SpringMain.java
Fri Dec 1 00:52:07 2006
@@ -35,26 +35,19 @@
{
if( System.getProperty( "com.sun.management.jmxremote" ) != null )
{
- new ClassPathXmlApplicationContext( getJmxApplicationContexts() );
System.out.println( "JMX enabled." );
}
else
{
- new ClassPathXmlApplicationContext( getApplicationContext() );
System.out.println( "JMX disabled. Please set the "
+ "'com.sun.management.jmxremote' system property to
enable JMX." );
}
+ new ClassPathXmlApplicationContext( getApplicationContext() );
System.out.println( "Listening ..." );
}
public static String getApplicationContext()
{
return "org/apache/mina/example/chat/serverContext.xml";
- }
-
- public static String[] getJmxApplicationContexts()
- {
- return new String[] { "org/apache/mina/example/chat/serverContext.xml",
- "org/apache/mina/example/chat/jmxContext.xml" };
}
}
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/chat/serverContext.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/serverContext.xml?view=diff&rev=481187&r1=481186&r2=481187
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/chat/serverContext.xml
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/chat/serverContext.xml
Fri Dec 1 00:52:07 2006
@@ -26,7 +26,7 @@
<bean id="bogusTrustManagerFactory"
class="org.apache.mina.integration.spring.ssl.BogusTrustManagerFactory"/>
- <!-- SSLContext to be used when acting as a server (client <-> proxy) -->
+ <!-- SSLContext to be used -->
<bean id="sslContext"
class="org.apache.mina.integration.spring.ssl.SSLContextFactoryBean">
<property name="protocol" value="TLS"/>
<property name="keyManagerFactoryAlgorithm" value="SunX509"/>
@@ -35,10 +35,24 @@
<property name="trustManagerFactory"><ref
local="bogusTrustManagerFactory"/></property>
</bean>
- <!-- The filter chain. Adds an SSLFilter, a TextLineCodec and a
LoggingFilter -->
+ <!-- The non-SSL filter chain. Adds a TextLineCodec and a LoggingFilter -->
<bean id="filterChainBuilder"
class="org.apache.mina.integration.spring.DefaultIoFilterChainBuilderFactoryBean">
<property name="filters">
<list>
+ <bean class="org.apache.mina.filter.codec.ProtocolCodecFilter">
+ <constructor-arg>
+ <bean
class="org.apache.mina.filter.codec.textline.TextLineCodecFactory" />
+ </constructor-arg>
+ </bean>
+ <bean class="org.apache.mina.filter.LoggingFilter" />
+ </list>
+ </property>
+ </bean>
+
+ <!-- The SSL filter chain. Adds an SSLFilter, a TextLineCodec and a
LoggingFilter -->
+ <bean id="sslFilterChainBuilder"
class="org.apache.mina.integration.spring.DefaultIoFilterChainBuilderFactoryBean">
+ <property name="filters">
+ <list>
<bean class="org.apache.mina.filter.SSLFilter">
<constructor-arg ref="sslContext"/>
</bean>
@@ -53,24 +67,19 @@
</bean>
<!-- The IoAcceptor which binds to port 1234 -->
- <bean id="ioAcceptor"
class="org.apache.mina.integration.spring.IoAcceptorFactoryBean">
- <property name="target">
- <bean class="org.apache.mina.transport.socket.nio.SocketAcceptor" />
- </property>
- <property name="bindings">
- <list>
- <bean class="org.apache.mina.integration.spring.Binding">
- <property name="address" value=":1234" />
- <property name="handler" ref="chatHandler" />
- <property name="serviceConfig">
- <bean
class="org.apache.mina.transport.socket.nio.SocketAcceptorConfig">
- <property name="filterChainBuilder" ref="filterChainBuilder" />
- <property name="reuseAddress" value="true" />
- </bean>
- </property>
- </bean>
- </list>
- </property>
+ <bean id="ioAcceptor"
class="org.apache.mina.transport.socket.nio.SocketAcceptor" init-method="bind"
destroy-method="unbind">
+ <property name="localAddress" value=":1234" />
+ <property name="handler" ref="chatHandler" />
+ <property name="reuseAddress" value="true" />
+ <property name="filterChainBuilder" ref="filterChainBuilder" />
+ </bean>
+
+ <!-- The SSL enabled IoAcceptor which binds to port 1235 -->
+ <bean id="ioAcceptorWithSSL"
class="org.apache.mina.transport.socket.nio.SocketAcceptor" init-method="bind"
destroy-method="unbind">
+ <property name="localAddress" value=":1235" />
+ <property name="handler" ref="chatHandler" />
+ <property name="reuseAddress" value="true" />
+ <property name="filterChainBuilder" ref="sslFilterChainBuilder" />
</bean>
<!-- JMX stuff. Creates an MBeanServer. -->
