Added maven support.

Author: js-labs

build.xml

@@ -17,17 +17,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<project name="JS-Collider">
+<project name="js-collider">
 
-    <property name="VERSION" value="0.92"/>
-    <property name="OUT_DIR" location="out/production"/>
+    <xmlproperty file="pom.xml" prefix="pom"/>
+    <property name="VERSION" value="${pom.project.version}"/>
+    <property name="OUT_DIR" location="target"/>
 
     <macrodef name="run-test">
         <attribute name="name"/>
         <sequential>
             <java classname="org.jsl.tests.@{name}.Main" fork="true">
                 <classpath>
-                    <pathelement location="${OUT_DIR}/core"/>
+                    <pathelement location="${OUT_DIR}/classes"/>
                     <pathelement location="${OUT_DIR}/tests"/>
                 </classpath>
                 <jvmarg value="-ea"/>
@@ -38,24 +39,24 @@
     </macrodef>
 
     <target name="clean">
-        <delete dir="out"/>
+        <delete dir="${OUT_DIR}"/>
     </target>
 
     <target name="compile">
-        <mkdir dir="${OUT_DIR}/core"/>
-        <javac srcdir="core/src" destdir="${OUT_DIR}/core" includeantruntime="false" debug="true"/>
+        <mkdir dir="${OUT_DIR}/classes"/>
+        <javac srcdir="src/main/java" destdir="${OUT_DIR}/classes" includeantruntime="false" debug="true"/>
     </target>
 
-    <target name="dist" depends="compile">
-        <jar jarfile="out/${ant.project.name}-${VERSION}.jar" basedir="${OUT_DIR}/core">
+    <target name="package" depends="compile">
+        <jar jarfile="${OUT_DIR}/${ant.project.name}-${VERSION}.jar" basedir="${OUT_DIR}/classes">
             <manifest>
                 <attribute name="Implementation-Title" value="${ant.project.name}"/>
                 <attribute name="Implementation-Vendor" value="org.jsl"/>
                 <attribute name="Implementation-Version" value="${VERSION}"/>
                 <attribute name="Sealed" value="true"/>
             </manifest>
         </jar>
-        <jar jarfile="out/${ant.project.name}-${VERSION}-src.jar" basedir="core/src">
+        <jar jarfile="${OUT_DIR}/${ant.project.name}-${VERSION}-sources.jar" basedir="src/main/java">
             <manifest>
                 <attribute name="Implementation-Title" value="${ant.project.name}"/>
                 <attribute name="Implementation-Vendor" value="org.jsl"/>
@@ -69,7 +70,7 @@
         <mkdir dir="${OUT_DIR}/tests"/>
         <javac srcdir="tests/src" destdir="${OUT_DIR}/tests" includeantruntime="false" debug="true">
             <classpath>
-                <pathelement location="${OUT_DIR}/core"/>
+                <pathelement location="${OUT_DIR}/classes"/>
             </classpath>
         </javac>
     </target>

pom.xml

@@ -0,0 +1,47 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.jsl.collider</groupId>
+  <artifactId>js-collider</artifactId>
+  <packaging>jar</packaging>
+
+  <name>js-collider</name>
+  <version>0.93</version>
+  <url>https://github.com/js-labs/js-collider</url>
+  <description>NIO framework</description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.4</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>

core/src/org/jsl/collider/Acceptor.java renamed to src/main/java/org/jsl/collider/Acceptor.java

@@ -34,7 +34,7 @@
 import java.util.logging.Logger;
 
 
-public class AcceptorImpl extends SessionEmitterImpl
+class AcceptorImpl extends SessionEmitterImpl
         implements ColliderImpl.ChannelHandler
 {
     private class ChannelAcceptor extends ThreadPool.Runnable

core/src/org/jsl/collider/AcceptorImpl.java renamed to src/main/java/org/jsl/collider/AcceptorImpl.java

@@ -320,7 +320,7 @@ public void removeDatagramListenerNoWait( final DatagramListener datagramListene
         }
     }
 
-    private static final Logger s_logger = Logger.getLogger( "org.jsl.collider.Collider" );
+    private static final Logger s_logger = Logger.getLogger( Collider.class.getName() );
 
     private static final AtomicReferenceFieldUpdater<ColliderImpl, SelectorThreadRunnable> s_strHeadUpdater =
             AtomicReferenceFieldUpdater.newUpdater( ColliderImpl.class, SelectorThreadRunnable.class, "m_strHead" );

core/src/org/jsl/collider/Collider.java renamed to src/main/java/org/jsl/collider/Collider.java

@@ -20,13 +20,15 @@
 import org.jsl.collider.RetainableByteBuffer;
 import org.jsl.collider.RetainableByteBufferPool;
 import org.jsl.tests.Util;
-
+import java.util.logging.Logger;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class Main
 {
+    private static final Logger s_logger = Logger.getLogger( Main.class.getName() );
     private static final int OPS = 1000000;
+
     private final Semaphore m_sema;
     private final RetainableByteBufferPool m_pool;
     private ReleaseThread m_releaseThread;
@@ -174,7 +176,7 @@ private void run()
             ex.printStackTrace();
         }
 
-        System.out.println( m_pool.clear() );
+        System.out.println( s_logger );
     }
 
     public static void main( String [] args )