Skip to content

Commit 570f41b

Browse files
elecharnyelecharny
committed
Bumped up the spring dependency to a more recent version
1 parent 74288d1 commit 570f41b

4 files changed

Lines changed: 116 additions & 53 deletions

File tree

‎mina-example/src/main/resources/org/apache/mina/example/chat/serverContext.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
<bean id="sslContextFactory" class="org.apache.mina.filter.ssl.SslContextFactory">
5353
<property name="protocol" value="TLS"/>
5454
<property name="keyManagerFactoryAlgorithm" value="SunX509"/>
55-
<property name="keyManagerFactoryKeyStore"><ref local="keyStore"/></property>
55+
<property name="keyManagerFactoryKeyStore"><ref bean="keyStore"/></property>
5656
<property name="keyManagerFactoryKeyStorePassword" value="boguspw"/>
57-
<property name="trustManagerFactory"><ref local="bogusTrustManagerFactory"/></property>
57+
<property name="trustManagerFactory"><ref bean="bogusTrustManagerFactory"/></property>
5858
</bean>
5959

6060
<bean id="sslContext" factory-bean="sslContextFactory" factory-method="newInstance"/>
@@ -130,7 +130,7 @@
130130
<property name="beans">
131131
<map>
132132
<entry key="chatServer:name=ioHandler">
133-
<ref local="chatHandler"/>
133+
<ref bean="chatHandler"/>
134134
</entry>
135135
</map>
136136
</property>
@@ -140,7 +140,7 @@
140140
</bean>
141141
</property>
142142
<property name="server">
143-
<ref local="mbeanServer"/>
143+
<ref bean="mbeanServer"/>
144144
</property>
145145
</bean>
146146

‎mina-integration-xbean/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,12 @@
6363

6464
<dependency>
6565
<groupId>org.springframework</groupId>
66-
<artifactId>spring</artifactId>
66+
<artifactId>spring-beans</artifactId>
67+
</dependency>
68+
69+
<dependency>
70+
<groupId>org.springframework</groupId>
71+
<artifactId>spring-context</artifactId>
6772
</dependency>
6873

6974
<dependency>

‎mina-integration-xbean/src/test/resources/org/apache/mina/integration/xbean/datagramAcceptor.xml‎

Lines changed: 82 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,37 +20,98 @@
2020
-->
2121

2222
<spring:beans xmlns:spring="http://xbean.apache.org/schemas/spring/1.0"
23-
xmlns:s="http://www.springframework.org/schema/beans"
24-
xmlns="http://mina.apache.org/config/1.0">
23+
xmlns:s="http://www.springframework.org/schema/beans">
24+
<!-- Initialize datagramAcceptor0 -->
25+
<bean class="org.apache.mina.transport.socket.nio.NioDatagramAcceptor" id="datagramAcceptor0"/>
26+
27+
<!-- Initialize datagramAcceptor1 -->
28+
<bean class="org.apache.mina.transport.socket.nio.NioDatagramAcceptor" id="datagramAcceptor1">
29+
<property name="defaultLocalAddress" value="192.168.0.1:110"/>
30+
</bean>
31+
32+
<!-- Initialize datagramAcceptor2 -->
33+
<bean class="org.apache.mina.transport.socket.nio.NioDatagramAcceptor" id="datagramAcceptor2">
34+
<constructor-arg ref="taskExecutor"/>
35+
<property name="closeOnDeactivation" value="false"/>
36+
</bean>
37+
38+
<!-- Initialize StandardThreadPool use for datagramAcceptor2 -->
39+
<bean id="taskExecutor" class="org.apache.mina.integration.xbean.StandardThreadPool">
40+
<constructor-arg name="maxThreads" value="4"/>
41+
</bean>
42+
43+
<!-- Initialize datagramAcceptor3 -->
44+
<bean class="org.apache.mina.transport.socket.nio.NioDatagramAcceptor" id="datagramAcceptor3">
45+
<property name="defaultLocalAddresses">
46+
<list>
47+
<ref bean="socketAddress0"/>
48+
<ref bean="socketAddress1"/>
49+
<ref bean="socketAddress2"/>
50+
</list>
51+
</property>
52+
</bean>
53+
54+
<!-- Initialize 1st-3rd InetSocketAddress as list in datagramAcceptor3 -->
55+
<bean id="socketAddress0" class="java.net.InetSocketAddress">
56+
<constructor-arg ref="byAddress0" index="0"/>
57+
<constructor-arg value="10001" index="1"/>
58+
</bean>
2559

26-
<nioDatagramAcceptor id="datagramAcceptor0" />
60+
<bean id="socketAddress1" class="java.net.InetSocketAddress">
61+
<constructor-arg ref="byAddress1" index="0"/>
62+
<constructor-arg value="10002" index="1"/>
63+
</bean>
2764

28-
<nioDatagramAcceptor id="datagramAcceptor1" defaultLocalAddress="192.168.0.1:110" />
65+
<bean id="socketAddress2" class="java.net.InetSocketAddress">
66+
<constructor-arg ref="byAddress2" index="0"/>
67+
<constructor-arg value="10003" index="1"/>
68+
</bean>
2969

30-
<nioDatagramAcceptor id="datagramAcceptor2" executor="#threadPoolExecutor" closeOnDeactivation="false" />
70+
<!-- Initialize 192.168.0.1 as byte[] for input of InetSocketAddress->socketAddress0 -->
71+
<bean id="byAddress0" class="java.net.InetAddress" factory-method="getByAddress">
72+
<constructor-arg>
73+
<array>
74+
<value>-64</value>
75+
<value>-88</value>
76+
<value>0</value>
77+
<value>1</value>
78+
</array>
79+
</constructor-arg>
80+
</bean>
3181

32-
<nioDatagramAcceptor id="datagramAcceptor3">
33-
<defaultLocalAddresses>
34-
<socketAddress>192.168.0.1:10001</socketAddress>
35-
<socketAddress>192.168.0.2:10002</socketAddress>
36-
<socketAddress>192.168.0.3:10003</socketAddress>
37-
</defaultLocalAddresses>
38-
</nioDatagramAcceptor>
82+
<!-- Initialize 192.168.0.2 as byte[] for input of InetSocketAddress->socketAddress1 -->
83+
<bean id="byAddress1" class="java.net.InetAddress" factory-method="getByAddress">
84+
<constructor-arg>
85+
<array>
86+
<value>-64</value>
87+
<value>-88</value>
88+
<value>0</value>
89+
<value>2</value>
90+
</array>
91+
</constructor-arg>
92+
</bean>
93+
94+
<!-- Initialize 192.168.0.3 as byte[] for input of InetSocketAddress->socketAddress2 -->
95+
<bean id="byAddress2" class="java.net.InetAddress" factory-method="getByAddress">
96+
<constructor-arg>
97+
<array>
98+
<value>-64</value>
99+
<value>-88</value>
100+
<value>0</value>
101+
<value>3</value>
102+
</array>
103+
</constructor-arg>
104+
</bean>
39105

40-
<nioDatagramAcceptor id="datagramAcceptor4" />
41-
42-
<standardThreadPool id="threadPoolExecutor" maxThreads="4"/>
43-
44106
<!--
45-
Sets up the MinaPropertyEditorRegistrar which conveniently installs all the
46-
required MINA PropertyEditor implementations found in the MINA Integration
47-
Beans module.
107+
Sets up the MinaPropertyEditorRegistrar which conveniently installs all the
108+
required MINA PropertyEditor implementations found in the MINA Integration
48109
-->
49110
<s:bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
50111
<s:property name="propertyEditorRegistrars">
51112
<s:list>
52113
<s:bean class="org.apache.mina.integration.xbean.MinaPropertyEditorRegistrar"/>
53114
</s:list>
54115
</s:property>
55-
</s:bean>
56-
</spring:beans>
116+
</s:bean>
117+
</spring:beans>

‎pom.xml‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,17 @@
154154
<version.slf4j.api>1.7.36</version.slf4j.api>
155155
<version.slf4j.reload4j>1.7.36</version.slf4j.reload4j>
156156
<version.slf4j.jcl.over.slf4j>1.7.36</version.slf4j.jcl.over.slf4j>
157-
<version.springframework>2.5.6.SEC03</version.springframework>
157+
<version.springframework>5.3.39</version.springframework>
158+
<version.springframework.old>2.5.6.SEC03</version.springframework.old>
158159
<version.tomcat.jni>10.0.27</version.tomcat.jni>
159160
<version.xbean.spring>4.26</version.xbean.spring>
160161

161162
<!-- OSGi minimum versions -->
162163
<osgi-min-version.slf4j.api>1.7</osgi-min-version.slf4j.api>
164+
165+
<!-- Define the Java source and target version -->
166+
<maven.compiler.source>8</maven.compiler.source>
167+
<maven.compiler.target>8</maven.compiler.target>
163168
</properties>
164169

165170
<modules>
@@ -257,21 +262,19 @@
257262
<dependency>
258263
<groupId>org.springframework</groupId>
259264
<artifactId>spring</artifactId>
265+
<version>${version.springframework.old}</version>
266+
</dependency>
267+
268+
<dependency>
269+
<groupId>org.springframework</groupId>
270+
<artifactId>spring-beans</artifactId>
271+
<version>${version.springframework}</version>
272+
</dependency>
273+
274+
<dependency>
275+
<groupId>org.springframework</groupId>
276+
<artifactId>spring-context</artifactId>
260277
<version>${version.springframework}</version>
261-
<exclusions>
262-
<exclusion>
263-
<groupId>commons-logging</groupId>
264-
<artifactId>commons-logging</artifactId>
265-
</exclusion>
266-
<exclusion>
267-
<groupId>commons-logging</groupId>
268-
<artifactId>commons-logging-api</artifactId>
269-
</exclusion>
270-
<exclusion>
271-
<groupId>javax.servlet</groupId>
272-
<artifactId>servlet-api</artifactId>
273-
</exclusion>
274-
</exclusions>
275278
</dependency>
276279

277280
<dependency>
@@ -456,9 +459,6 @@
456459
<artifactId>maven-compiler-plugin</artifactId>
457460
<version>${version.compiler.plugin}</version>
458461
<configuration>
459-
<source>1.7</source>
460-
<target>1.7</target>
461-
<optimize>true</optimize>
462462
<showDeprecations>true</showDeprecations>
463463
<encoding>ISO-8859-1</encoding>
464464
</configuration>
@@ -762,12 +762,12 @@
762762
<pluginExecution>
763763
<pluginExecutionFilter>
764764
<groupId>org.apache.xbean</groupId>
765-
<artifactId>maven-xbean-plugin</artifactId>
766-
<versionRange>[4.12,)</versionRange>
767-
<goals>
768-
<goal>mapping</goal>
769-
</goals>
770-
</pluginExecutionFilter>
765+
<artifactId>maven-xbean-plugin</artifactId>
766+
<versionRange>[4.12,)</versionRange>
767+
<goals>
768+
<goal>mapping</goal>
769+
</goals>
770+
</pluginExecutionFilter>
771771
<action>
772772
<ignore />
773773
</action>
@@ -784,10 +784,7 @@
784784
<artifactId>maven-compiler-plugin</artifactId>
785785
<configuration>
786786
<encoding>UTF-8</encoding>
787-
<source>1.8</source>
788-
<target>1.8</target>
789787
<debug>true</debug>
790-
<optimize>true</optimize>
791788
<showDeprecations>true</showDeprecations>
792789
</configuration>
793790
</plugin>

0 commit comments

Comments
 (0)