Index: apacheds/pom.xml
===================================================================
--- apacheds/pom.xml	(revision 369610)
+++ apacheds/pom.xml	(working copy)
@@ -1,93 +1,97 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.directory</groupId>
-    <artifactId>build</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apache.directory.server</groupId>
-  <version>0.9.4-SNAPSHOT</version>
-  <artifactId>build</artifactId>
-  <name>apacheds-build</name>
-  <packaging>pom</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.directory.common</groupId>
-      <artifactId>org.apache.ldap.common</artifactId>
-      <version>0.9.4-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <profile>
-      <id>jdk1.5</id>
-      <activation>
-        <jdk>1.5</jdk>
-      </activation>
-      <modules>
-        <module>core</module>
-        <module>shared</module>
-        <module>plugin</module>
-        <module>core-unit</module>
-        <!--
-        <module>server-ssl</module>
-        <module>server-unit</module>
-        <module>server-main</module>
-        -->
-        <module>protocol-common</module>
-        <module>protocols</module>
-        <module>standalone/simple</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>jdk1.4</id>
-      <activation>
-        <jdk>1.4</jdk>
-      </activation>
-      <modules>
-        <module>core</module>
-        <module>shared</module>
-        <module>plugin</module>
-        <module>core-unit</module>
-        <module>server</module>
-        <module>server-unit</module>
-        <module>server-main</module>
-        <module>protocols</module>
-      </modules>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>validate</phase>
-                <configuration>
-                  <tasks>
-                    <echo>
-====================================================================
-                       W A R N I N G
-                       -------------
-
-Build with 1.4 jvm will not include modules:
- 
- o apacheds-server-ssl
-
-Use JDK 1.5 to make sure these modules build.
-====================================================================
-                    </echo>
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory</groupId>
+    <artifactId>build</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.directory.server</groupId>
+  <version>0.9.4-SNAPSHOT</version>
+  <artifactId>build</artifactId>
+  <name>apacheds-build</name>
+  <packaging>pom</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.common</groupId>
+      <artifactId>org.apache.ldap.common</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>jdk1.5</id>
+      <activation>
+        <jdk>1.5</jdk>
+      </activation>
+      <modules>
+        <module>core</module>
+        <module>shared</module>
+        <module>plugin</module>
+        <module>core-unit</module>
+        <!--
+        <module>server-ssl</module>
+        <module>server-unit</module>
+        <module>server-main</module>
+        -->
+        <module>protocol-common</module>
+        <module>protocols</module>
+        <module>standalone/simple</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>jdk1.4</id>
+      <activation>
+        <jdk>1.4</jdk>
+      </activation>
+      <modules>
+        <module>core</module>
+        <module>shared</module>
+        <module>plugin</module>
+        <module>core-unit</module>
+        <!--
+        <module>server-ssl</module>
+        <module>server-unit</module>
+        <module>server-main</module>
+        -->
+        <module>protocol-common</module>
+        <module>protocols</module>
+        <module>standalone/simple</module>
+      </modules>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>validate</phase>
+                <configuration>
+                  <tasks>
+                    <echo>
+====================================================================
+                       W A R N I N G
+                       -------------
+
+Build with 1.4 jvm will not include modules:
+ 
+ o apacheds-server-ssl
+
+Use JDK 1.5 to make sure these modules build.
+====================================================================
+                    </echo>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
Index: apacheds/protocols/ldap/pom.xml
===================================================================
--- apacheds/protocols/ldap/pom.xml	(revision 369610)
+++ apacheds/protocols/ldap/pom.xml	(working copy)
@@ -1,37 +1,49 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.directory.server.protocols</groupId>
-    <artifactId>build</artifactId>
-    <version>0.9.4-SNAPSHOT</version>
-  </parent>
-  <version>0.9.4-SNAPSHOT</version>
-  <artifactId>org.apache.directory.protocol.ldap</artifactId>
-  <name>ldap-protocol</name>
-  <packaging>jar</packaging>  
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <version>1.2.19</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.mina</groupId>
-      <artifactId>org.apache.mina.asn1</artifactId>
-      <version>0.9.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.mina</groupId>
-      <artifactId>org.apache.mina.filter.ssl</artifactId>
-      <version>0.9.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>org.apache.ldap.server.core</artifactId>
-      <version>0.9.4-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.server.protocols</groupId>
+    <artifactId>build</artifactId>
+    <version>0.9.4-SNAPSHOT</version>
+  </parent>
+  <version>0.9.4-SNAPSHOT</version>
+  <artifactId>org.apache.directory.protocol.ldap</artifactId>
+  <name>ldap-protocol</name>
+  <packaging>jar</packaging>  
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>nlog4j</artifactId>
+      <version>1.2.19</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.mina</groupId>
+      <artifactId>org.apache.mina.asn1</artifactId>
+      <version>0.9.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>org.apache.ldap.server.core</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>jdk1.5</id>
+      <activation>
+        <jdk>1.5</jdk>
+      </activation>  
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.directory.mina</groupId>
+          <artifactId>org.apache.mina.filter.ssl</artifactId>
+          <version>0.9.1-SNAPSHOT</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
+</project>
+
Index: mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java
===================================================================
--- mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java	(revision 369610)
+++ mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java	(working copy)
@@ -44,8 +44,6 @@
 import org.apache.mina.transport.socket.nio.SocketSessionManager;
 import org.apache.mina.util.Queue;
 
-import com.sun.org.apache.xalan.internal.xsltc.runtime.Hashtable;
-
 /**
  * {@link IoAcceptor} for socket transport (TCP/IP).
  * 
@@ -64,7 +62,7 @@
     private int receiveBufferSize = -1;
     private Selector selector;
     private final Map channels = new HashMap();
-    private final Hashtable sessions = new Hashtable();
+    private final HashMap sessions = new HashMap();
 
     private final Queue registerQueue = new Queue();
     private final Queue cancelQueue = new Queue();
Index: mina/pom.xml
===================================================================
--- mina/pom.xml	(revision 369610)
+++ mina/pom.xml	(working copy)
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.directory</groupId>
-    <artifactId>build</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apache.directory.mina</groupId>
-  <version>0.9.1-SNAPSHOT</version>
-  <artifactId>build</artifactId>
-  <name>mina-build</name>
-  <packaging>pom</packaging>
-
-  <dependencies>
-  </dependencies>
-
-  <profiles>
-    <profile>
-      <id>jdk1.5</id>
-      <activation>
-        <jdk>1.5</jdk>
-      </activation>
-      <modules>
-        <module>core</module>
-        <module>asn1</module>
-        <module>ssl</module>
-        <module>examples</module>
-        <module>spring</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>jdk1.4</id>
-      <activation>
-        <jdk>1.4</jdk>
-      </activation>
-      <modules>
-        <module>mina</module>
-        <module>asn1</module>
-      </modules>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>validate</phase>
-                <configuration>
-                  <tasks>
-                    <echo>
-====================================================================
-                       W A R N I N G
-                       -------------
-
-Build with 1.4 jvm will not include modules:
- 
- o mina-ssl
- o mina-spring
- o mina-examples
-
-Use JDK 1.5 to make sure these modules build.
-====================================================================
-                    </echo>
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory</groupId>
+    <artifactId>build</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.directory.mina</groupId>
+  <version>0.9.1-SNAPSHOT</version>
+  <artifactId>build</artifactId>
+  <name>mina-build</name>
+  <packaging>pom</packaging>
+
+  <dependencies>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>jdk1.5</id>
+      <activation>
+        <jdk>1.5</jdk>
+      </activation>
+      <modules>
+        <module>core</module>
+        <module>asn1</module>
+        <module>ssl</module>
+        <module>examples</module>
+        <module>spring</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>jdk1.4</id>
+      <activation>
+        <jdk>1.4</jdk>
+      </activation>
+      <modules>
+        <module>core</module>
+        <module>asn1</module>
+      </modules>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>validate</phase>
+                <configuration>
+                  <tasks>
+                    <echo>
+====================================================================
+                       W A R N I N G
+                       -------------
+
+Build with 1.4 jvm will not include modules:
+ 
+ o mina-ssl
+ o mina-spring
+ o mina-examples
+
+Use JDK 1.5 to make sure these modules build.
+====================================================================
+                    </echo>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+</project>