Author: trustin
Date: Sun Sep 30 06:24:18 2007
New Revision: 580724
URL: http://svn.apache.org/viewvc?rev=580724&view=rev
Log:
Resolved issue: DIRMINA-426 (Clean up POM dependencies using
dependencyManagement section.)
Modified:
mina/trunk/core/pom.xml
mina/trunk/example/pom.xml
mina/trunk/example/src/main/resources/org/apache/mina/example/chat/serverContext.xml
mina/trunk/filter-codec-http/pom.xml
mina/trunk/filter-codec-netty/pom.xml
mina/trunk/filter-compression/pom.xml
mina/trunk/integration-jmx/pom.xml
mina/trunk/integration-spring/pom.xml
mina/trunk/pom.xml
mina/trunk/protocol-http-client/pom.xml
mina/trunk/transport-apr/pom.xml
mina/trunk/transport-serial/pom.xml
Modified: mina/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/core/pom.xml?rev=580724&r1=580723&r2=580724&view=diff
==============================================================================
--- mina/trunk/core/pom.xml (original)
+++ mina/trunk/core/pom.xml Sun Sep 30 06:24:18 2007
@@ -11,26 +11,6 @@
<packaging>bundle</packaging>
<dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.4.3</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.2_Java1.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: mina/trunk/example/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/example/pom.xml?rev=580724&r1=580723&r2=580724&view=diff
==============================================================================
--- mina/trunk/example/pom.xml (original)
+++ mina/trunk/example/pom.xml Sun Sep 30 06:24:18 2007
@@ -13,73 +13,19 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-integration-spring</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-protocol-http-client</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.0.6</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- <version>2.0.6</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jmx</artifactId>
- <version>2.0.6</version>
- <scope>compile</scope>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-protocol-http-client</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>2.0.6</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>1.4.1</version>
- <scope>test</scope>
+ <artifactId>spring</artifactId>
</dependency>
-
</dependencies>
-
</project>
Modified:
mina/trunk/example/src/main/resources/org/apache/mina/example/chat/serverContext.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/resources/org/apache/mina/example/chat/serverContext.xml?rev=580724&r1=580723&r2=580724&view=diff
==============================================================================
---
mina/trunk/example/src/main/resources/org/apache/mina/example/chat/serverContext.xml
(original)
+++
mina/trunk/example/src/main/resources/org/apache/mina/example/chat/serverContext.xml
Sun Sep 30 06:24:18 2007
@@ -27,7 +27,7 @@
<bean id="bogusTrustManagerFactory"
class="org.apache.mina.integration.spring.ssl.BogusTrustManagerFactory"/>
<!-- SSLContext to be used -->
- <bean id="sslContext"
class="org.apache.mina.integration.spring.ssl.SSLContextFactoryBean">
+ <bean id="sslContext"
class="org.apache.mina.integration.spring.ssl.SslContextFactoryBean">
<property name="protocol" value="TLS"/>
<property name="keyManagerFactoryAlgorithm" value="SunX509"/>
<property name="keyManagerFactoryKeyStore"><ref
local="keyStore"/></property>
@@ -40,7 +40,7 @@
<property name="filters">
<list>
<bean class="org.apache.mina.filter.executor.ExecutorFilter"/>
- <bean class="org.apache.mina.filter.logging.MDCInjectionFilter"/>
+ <bean class="org.apache.mina.filter.logging.MdcInjectionFilter"/>
<bean class="org.apache.mina.filter.codec.ProtocolCodecFilter">
<constructor-arg>
<bean
class="org.apache.mina.filter.codec.textline.TextLineCodecFactory" />
@@ -56,8 +56,8 @@
<property name="filters">
<list>
<bean class="org.apache.mina.filter.executor.ExecutorFilter"/>
- <bean class="org.apache.mina.filter.logging.MDCInjectionFilter"/>
- <bean class="org.apache.mina.filter.ssl.SSLFilter">
+ <bean class="org.apache.mina.filter.logging.MdcInjectionFilter"/>
+ <bean class="org.apache.mina.filter.ssl.SslFilter">
<constructor-arg ref="sslContext"/>
</bean>
<bean class="org.apache.mina.filter.codec.ProtocolCodecFilter">
@@ -71,7 +71,7 @@
</bean>
<!-- The IoAcceptor which binds to port 1234 -->
- <bean id="ioAcceptor"
class="org.apache.mina.transport.socket.nio.SocketAcceptor" init-method="bind"
destroy-method="unbind">
+ <bean id="ioAcceptor"
class="org.apache.mina.transport.socket.nio.NioSocketAcceptor"
init-method="bind" destroy-method="unbind">
<property name="localAddress" value=":1234" />
<property name="handler" ref="chatHandler" />
<property name="reuseAddress" value="true" />
@@ -79,7 +79,7 @@
</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">
+ <bean id="ioAcceptorWithSSL"
class="org.apache.mina.transport.socket.nio.NioSocketAcceptor"
init-method="bind" destroy-method="unbind">
<property name="localAddress" value=":1235" />
<property name="handler" ref="chatHandler" />
<property name="reuseAddress" value="true" />
Modified: mina/trunk/filter-codec-http/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/pom.xml?rev=580724&r1=580723&r2=580724&view=diff
==============================================================================
--- mina/trunk/filter-codec-http/pom.xml (original)
+++ mina/trunk/filter-codec-http/pom.xml Sun Sep 30 06:24:18 2007
@@ -11,14 +11,12 @@
<packaging>bundle</packaging>
<dependencies>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
</dependencies>
</project>
Modified: mina/trunk/filter-codec-netty/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-netty/pom.xml?rev=580724&r1=580723&r2=580724&view=diff
==============================================================================
--- mina/trunk/filter-codec-netty/pom.xml (original)
+++ mina/trunk/filter-codec-netty/pom.xml Sun Sep 30 06:24:18 2007
@@ -12,27 +12,13 @@
<dependencies>
<dependency>
- <groupId>net.gleamynode</groupId>
- <artifactId>netty2</artifactId>
- <version>1.9.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
-
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
- <scope>test</scope>
+ <groupId>net.gleamynode</groupId>
+ <artifactId>netty2</artifactId>
</dependency>
-
</dependencies>
-
</project>
Modified: mina/trunk/filter-compression/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-compression/pom.xml?rev=580724&r1=580723&r2=580724&view=diff
==============================================================================
--- mina/trunk/filter-compression/pom.xml (original)
+++ mina/trunk/filter-compression/pom.xml Sun Sep 30 06:24:18 2007
@@ -11,36 +11,15 @@
<packaging>bundle</packaging>
<dependencies>
-
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.2_Java1.3</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jzlib</artifactId>
- <version>1.0.7</version>
- <scope>compile</scope>
</dependency>
-
</dependencies>
-
</project>
Modified: mina/trunk/integration-jmx/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/integration-jmx/pom.xml?rev=580724&r1=580723&r2=580724&view=diff
==============================================================================
--- mina/trunk/integration-jmx/pom.xml (original)
+++ mina/trunk/integration-jmx/pom.xml Sun Sep 30 06:24:18 2007
@@ -13,8 +13,6 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
</dependencies>
</project>
Modified: mina/trunk/integration-spring/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/integration-spring/pom.xml?rev=580724&r1=580723&r2=580724&view=diff
==============================================================================
--- mina/trunk/integration-spring/pom.xml (original)
+++ mina/trunk/integration-spring/pom.xml Sun Sep 30 06:24:18 2007
@@ -10,55 +10,14 @@
<name>Apache MINA Spring Integration</name>
<packaging>bundle</packaging>
<dependencies>
-
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.0.6</version>
- </dependency>
-
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.6</version>
- </dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.2_Java1.3</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>1.4.1</version>
- <scope>test</scope>
+ <artifactId>spring</artifactId>
</dependency>
-
</dependencies>
-
</project>
Modified: mina/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/pom.xml?rev=580724&r1=580723&r2=580724&view=diff
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Sun Sep 30 06:24:18 2007
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>3</version>
+ <version>4</version>
</parent>
<organization>
<name>Apache MINA Project</name>
@@ -13,7 +13,7 @@
<groupId>org.apache.mina</groupId>
<version>2.0.0-M1-SNAPSHOT</version>
<artifactId>build</artifactId>
- <name>Apache MINA Root Build POM</name>
+ <name>Apache MINA Parent POM</name>
<packaging>pom</packaging>
<url>http://mina.apache.org/</url>
@@ -50,6 +50,8 @@
MINA (Multipurpose Infrastructure for Network Applications) is a
network application framework which helps users develop high
performance and highly scalable network applications easily.
+ It provides an abstract · event-driven · asynchronous
+ API over various transports such as TCP/IP and UDP/IP via Java NIO.
</description>
<licenses>
@@ -60,32 +62,190 @@
</license>
</licenses>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Submodules -->
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-transport-serial</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-transport-apr</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-filter-compression</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-filter-codec-netty</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-filter-codec-http</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-protocol-http-client</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-protocol-http-server</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-integration-jmx</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-integration-spring</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <!-- Transport -->
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>tomcat-apr</artifactId>
+ <version>5.5.15</version>
+ </dependency>
+ <dependency>
+ <groupId>org.rxtx</groupId>
+ <artifactId>rxtx</artifactId>
+ <version>2.1.7</version>
+ </dependency>
+
+ <!-- Filter -->
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jzlib</artifactId>
+ <version>1.0.7</version>
+ </dependency>
+
+ <!-- Protocol -->
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <!-- Integration -->
+ <dependency>
+ <groupId>net.gleamynode</groupId>
+ <artifactId>netty2</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>2.0.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
- <dependency>
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Testing -->
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.3.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Plugin Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
- <repositories>
- </repositories>
-
<modules>
<module>core</module>
<module>transport-serial</module>
@@ -95,8 +255,8 @@
<module>filter-codec-http</module>
<module>protocol-http-client</module>
<module>protocol-http-server</module>
- <module>integration-spring</module>
<module>integration-jmx</module>
+ <module>integration-spring</module>
<module>example</module>
</modules>
@@ -119,12 +279,6 @@
<configuration>
<excludes>
<exclude>**/Abstract*</exclude>
-
- <!-- Timing issues with these tests due to VM bug for releasing
file descriptors -->
-<!--
- <exclude>**/DatagramBindTest.java</exclude>
--->
-
<exclude>**/*RegressionTest*</exclude>
</excludes>
</configuration>
Modified: mina/trunk/protocol-http-client/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/pom.xml?rev=580724&r1=580723&r2=580724&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/pom.xml (original)
+++ mina/trunk/protocol-http-client/pom.xml Sun Sep 30 06:24:18 2007
@@ -30,24 +30,14 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-filter-codec-http</artifactId>
- <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- <version>1.4.3</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Modified: mina/trunk/transport-apr/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/pom.xml?rev=580724&r1=580723&r2=580724&view=diff
==============================================================================
--- mina/trunk/transport-apr/pom.xml (original)
+++ mina/trunk/transport-apr/pom.xml Sun Sep 30 06:24:18 2007
@@ -13,14 +13,10 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>tomcat-apr</artifactId>
- <version>5.5.15</version>
- <scope>compile</scope>
</dependency>
</dependencies>
Modified: mina/trunk/transport-serial/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-serial/pom.xml?rev=580724&r1=580723&r2=580724&view=diff
==============================================================================
--- mina/trunk/transport-serial/pom.xml (original)
+++ mina/trunk/transport-serial/pom.xml Sun Sep 30 06:24:18 2007
@@ -13,16 +13,11 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.rxtx</groupId>
<artifactId>rxtx</artifactId>
- <version>2.1.7</version>
- <scope>compile</scope>
</dependency>
</dependencies>
-
</project>
