You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2010/09/21 23:41:56 UTC
svn commit: r999658 - in /mina/trunk: ./ distribution/ mina-core/
mina-core/src/main/java/org/apache/mina/core/polling/ mina-example/
mina-filter-compression/ mina-integration-beans/ mina-integration-jmx/
mina-integration-ognl/ mina-integration-xbean/ ...
Author: elecharny
Date: Tue Sep 21 21:41:56 2010
New Revision: 999658
URL: http://svn.apache.org/viewvc?rev=999658&view=rev
Log:
reverted to 2.0.0-RC2 to add the missing ASL headers
Modified:
mina/trunk/distribution/pom.xml
mina/trunk/mina-core/pom.xml
mina/trunk/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
mina/trunk/mina-example/pom.xml
mina/trunk/mina-filter-compression/pom.xml
mina/trunk/mina-integration-beans/pom.xml
mina/trunk/mina-integration-jmx/pom.xml
mina/trunk/mina-integration-ognl/pom.xml
mina/trunk/mina-integration-xbean/pom.xml
mina/trunk/mina-legal/pom.xml
mina/trunk/mina-statemachine/pom.xml
mina/trunk/mina-transport-apr/pom.xml
mina/trunk/mina-transport-serial/pom.xml
mina/trunk/pom.xml
Modified: mina/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/distribution/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/distribution/pom.xml (original)
+++ mina/trunk/distribution/pom.xml Tue Sep 21 21:41:56 2010
@@ -24,7 +24,7 @@
<parent>
<artifactId>mina-parent</artifactId>
<groupId>org.apache.mina</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
Modified: mina/trunk/mina-core/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-core/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/mina-core/pom.xml (original)
+++ mina/trunk/mina-core/pom.xml Tue Sep 21 21:41:56 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-core</artifactId>
Modified: mina/trunk/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java (original)
+++ mina/trunk/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java Tue Sep 21 21:41:56 2010
@@ -741,6 +741,28 @@ public abstract class AbstractPollingIoP
}
}
+
+ private static String byteArrayToHex( byte[] barray )
+ {
+ char[] c = new char[barray.length * 2];
+ int pos = 0;
+
+ for ( byte b : barray )
+ {
+ int bb = ( b & 0x00FF ) >> 4;
+ c[pos++] = ( char ) ( bb > 9 ? bb + 0x37 : bb + 0x30 );
+ bb = b & 0x0F;
+ c[pos++] = ( char ) ( bb > 9 ? bb + 0x37 : bb + 0x30 );
+ if ( pos > 60 )
+ {
+ break;
+ }
+ }
+
+ return new String( c );
+ }
+
+
private void notifyIdleSessions(long currentTime) throws Exception {
// process idle sessions
if (currentTime - lastIdleCheckTime >= SELECT_TIMEOUT) {
Modified: mina/trunk/mina-example/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-example/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/mina-example/pom.xml (original)
+++ mina/trunk/mina-example/pom.xml Tue Sep 21 21:41:56 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-example</artifactId>
Modified: mina/trunk/mina-filter-compression/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-filter-compression/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/mina-filter-compression/pom.xml (original)
+++ mina/trunk/mina-filter-compression/pom.xml Tue Sep 21 21:41:56 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-filter-compression</artifactId>
Modified: mina/trunk/mina-integration-beans/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-integration-beans/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/mina-integration-beans/pom.xml (original)
+++ mina/trunk/mina-integration-beans/pom.xml Tue Sep 21 21:41:56 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-beans</artifactId>
Modified: mina/trunk/mina-integration-jmx/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-integration-jmx/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/mina-integration-jmx/pom.xml (original)
+++ mina/trunk/mina-integration-jmx/pom.xml Tue Sep 21 21:41:56 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-jmx</artifactId>
Modified: mina/trunk/mina-integration-ognl/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-integration-ognl/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/mina-integration-ognl/pom.xml (original)
+++ mina/trunk/mina-integration-ognl/pom.xml Tue Sep 21 21:41:56 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-ognl</artifactId>
Modified: mina/trunk/mina-integration-xbean/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-integration-xbean/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/mina-integration-xbean/pom.xml (original)
+++ mina/trunk/mina-integration-xbean/pom.xml Tue Sep 21 21:41:56 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: mina/trunk/mina-legal/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-legal/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/mina-legal/pom.xml (original)
+++ mina/trunk/mina-legal/pom.xml Tue Sep 21 21:41:56 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-legal</artifactId>
Modified: mina/trunk/mina-statemachine/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-statemachine/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/mina-statemachine/pom.xml (original)
+++ mina/trunk/mina-statemachine/pom.xml Tue Sep 21 21:41:56 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-statemachine</artifactId>
Modified: mina/trunk/mina-transport-apr/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-transport-apr/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/mina-transport-apr/pom.xml (original)
+++ mina/trunk/mina-transport-apr/pom.xml Tue Sep 21 21:41:56 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-apr</artifactId>
Modified: mina/trunk/mina-transport-serial/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/mina-transport-serial/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/mina-transport-serial/pom.xml (original)
+++ mina/trunk/mina-transport-serial/pom.xml Tue Sep 21 21:41:56 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-serial</artifactId>
Modified: mina/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/pom.xml?rev=999658&r1=999657&r2=999658&view=diff
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Tue Sep 21 21:41:56 2010
@@ -33,7 +33,7 @@
</organization>
<groupId>org.apache.mina</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-RC2-SNAPSHOT</version>
<artifactId>mina-parent</artifactId>
<name>Apache MINA</name>
<packaging>pom</packaging>