Merge branch 'maint' into sverk/trace-process_dump-matchstate

Conflicts:
	erts/emulator/beam/erl_printf_term.c
	erts/emulator/beam/erl_term.c
	erts/emulator/beam/utils.c

27 files changed, 944 insertions, 189 deletions

diff --git a/lib/jinterface/test/.classpath b/lib/jinterface/test/.classpath
new file mode 100644
index 0000000000..2e4a3e6776
--- /dev/null
+++ b/lib/jinterface/test/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="jinterface_SUITE_data" path="jinterface_SUITE_data"/>
+	<classpathentry kind="src" output="nc_SUITE_data" path="nc_SUITE_data"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jinterface"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lib/jinterface/test/.project b/lib/jinterface/test/.project
new file mode 100644
index 0000000000..4144c6ebea
--- /dev/null
+++ b/lib/jinterface/test/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jinterface_tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lib/jinterface/test/.settings/org.eclipse.jdt.core.prefs b/lib/jinterface/test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..af0f20f97a
--- /dev/null
+++ b/lib/jinterface/test/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/lib/jinterface/test/Makefile b/lib/jinterface/test/Makefile
index 90d4e01035..40abcd18a0 100644
--- a/lib/jinterface/test/Makefile
+++ b/lib/jinterface/test/Makefile
@@ -3,16 +3,17 @@
 #
 # Copyright Ericsson AB 2004-2012. All Rights Reserved.
 #
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # %CopyrightEnd%
 #
diff --git a/lib/jinterface/test/jinterface.spec b/lib/jinterface/test/jinterface.spec
index 99bc0f4005..b0d0fa9d8d 100644
--- a/lib/jinterface/test/jinterface.spec
+++ b/lib/jinterface/test/jinterface.spec
@@ -4,16 +4,17 @@
 %%
 %% Copyright Ericsson AB 2006-2010. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl
index 00abc97ff5..6d34a21209 100644
--- a/lib/jinterface/test/jinterface_SUITE.erl
+++ b/lib/jinterface/test/jinterface_SUITE.erl
@@ -3,16 +3,17 @@
 %%
 %% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -22,7 +23,8 @@
 	 init_per_suite/1, end_per_suite/1,
 	 init_per_testcase/2, end_per_testcase/2]).
 
--export([nodename/1, register_and_whereis/1, get_names/1, boolean_atom/1,
+-export([transport_factory/1,
+	 nodename/1, register_and_whereis/1, get_names/1, boolean_atom/1,
 	 node_ping/1, mbox_ping/1,
 	 java_erlang_send_receive/1,
 	 java_internal_send_receive_same_node/1,
@@ -39,7 +41,8 @@
 	 status_handler_localStatus/1, status_handler_remoteStatus/1,
 	 status_handler_connAttempt/1,
 	 maps/1,
-	 fun_equals/1
+	 fun_equals/1,
+	 core_match_bind/1
      ]).
 
 -include_lib("common_test/include/ct.hrl").
@@ -103,12 +106,14 @@ end_per_group(_GroupName, Config) ->
 
 fundamental() ->
     [
+     transport_factory,    % TransportFactoryTest.java
      nodename,             % Nodename.java
      register_and_whereis, % RegisterAndWhereis.java
      get_names,            % GetNames.java
      boolean_atom,         % BooleanAtom.java
      maps,                 % Maps.java
-     fun_equals            % FunEquals.java
+     fun_equals,           % FunEquals.java
+     core_match_bind       % CoreMatchBind.java
     ].
 
 ping() ->
@@ -201,6 +206,16 @@ end_per_testcase(_Case,Config) ->
 %%%-----------------------------------------------------------------
 %%% TEST CASES
 %%%-----------------------------------------------------------------
+transport_factory(doc) ->
+    ["TransportFactoryTest.java: Test custom OTP Transport Factory"];
+transport_factory(suite) ->
+    [];
+transport_factory(Config) when is_list(Config) ->
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "TransportFactoryTest").
+
+%%%-----------------------------------------------------------------
 nodename(doc) ->
     ["Nodename.java: "
      "Test OtpNode.node(), OtpNode.alive() and OtpNode.host()"];
@@ -705,6 +720,18 @@ fun_equals(Config) when is_list(Config) ->
            []).
 
 %%%-----------------------------------------------------------------
+core_match_bind(doc) ->
+    ["CoreMatchBind.java: "
+     "Test OtpErlangObject.match() and bind()"];
+core_match_bind(suite) ->
+    [];
+core_match_bind(Config) when is_list(Config) ->
+    ok = jitu:java(?config(java, Config),
+           ?config(data_dir, Config),
+           "CoreMatchBind",
+           []).
+
+%%%-----------------------------------------------------------------
 %%% INTERNAL FUNCTIONS
 %%%-----------------------------------------------------------------
 send_receive(TestCaseTag,Fun,Config) ->
diff --git a/lib/jinterface/test/jinterface_SUITE_data/.gitignore b/lib/jinterface/test/jinterface_SUITE_data/.gitignore
new file mode 100644
index 0000000000..6b468b62a9
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/.gitignore
@@ -0,0 +1 @@
+*.class
diff --git a/lib/jinterface/test/jinterface_SUITE_data/BooleanAtom.java b/lib/jinterface/test/jinterface_SUITE_data/BooleanAtom.java
index 9554d50c9f..0d482f3fd2 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/BooleanAtom.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/BooleanAtom.java
@@ -3,16 +3,17 @@
  *
  * Copyright Ericsson AB 2004-2010. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/jinterface/test/jinterface_SUITE_data/CoreMatchBind.java b/lib/jinterface/test/jinterface_SUITE_data/CoreMatchBind.java
new file mode 100644
index 0000000000..56b723e4fe
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/CoreMatchBind.java
@@ -0,0 +1,585 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2000-2015. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+import com.ericsson.otp.erlang.OtpErlangException;
+import com.ericsson.otp.erlang.OtpErlangInt;
+import com.ericsson.otp.erlang.OtpErlangList;
+import com.ericsson.otp.erlang.OtpErlangMap;
+import com.ericsson.otp.erlang.OtpErlangObject;
+import com.ericsson.otp.erlang.OtpErlangTuple;
+import com.ericsson.otp.erlang.OtpOutputStream;
+
+public class CoreMatchBind {
+
+    @SuppressWarnings("serial")
+    private static class DumbObject extends OtpErlangObject {
+
+        @Override
+        public String toString() {
+            return this.getClass().getSimpleName();
+        }
+
+        @Override
+        public void encode(final OtpOutputStream buf) {
+            fail("unexpected encode() call");
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            fail("unexpected equals() call");
+            return false;
+        }
+
+    }
+
+    @SuppressWarnings("serial")
+    private static class BoundObject extends OtpErlangObject {
+
+        @Override
+        public String toString() {
+            return this.getClass().getSimpleName();
+        }
+
+        @Override
+        public void encode(final OtpOutputStream buf) {
+            fail("unexpected encode() call");
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            fail("unexpected equals() call");
+            return false;
+        }
+
+    }
+
+    @SuppressWarnings("serial")
+    private static class TestObject extends OtpErlangObject {
+
+        private final Binder binder;
+        private DumbObject dumb;
+        private boolean flag;
+        private BoundObject obj;
+
+        public TestObject(final boolean flag, final Binder binder,
+                final DumbObject dumb) {
+            this.flag = flag;
+            this.binder = binder;
+            this.dumb = dumb;
+        }
+
+        public TestObject(final Binder binder, final BoundObject obj) {
+            this.binder = binder;
+            this.obj = obj;
+        }
+
+        public DumbObject getDumb() {
+            return dumb;
+        }
+
+        @Override
+        public String toString() {
+            return flag ? "T" : "F";
+        }
+
+        @Override
+        public void encode(final OtpOutputStream buf) {
+            fail("unexpected encode() call");
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (obj == null) {
+                fail("unexpected equals() call");
+            }
+            return o == obj;
+        }
+
+        @Override
+        public <T> boolean match(final OtpErlangObject term, final T binds) {
+            if (binds != binder) {
+                fail("invalid binder");
+            }
+            if (term != dumb) {
+                fail("invalid object");
+            }
+            return flag;
+        }
+
+        @Override
+        public <T> OtpErlangObject bind(final T binds)
+                throws OtpErlangException {
+            if (binds != binder) {
+                fail("invalid binder");
+            }
+            return obj;
+        }
+
+    }
+
+    /*
+     * "always matched" object
+     */
+    @SuppressWarnings("serial")
+    private static class Any extends OtpErlangObject {
+
+        @Override
+        public String toString() {
+            return "any";
+        }
+
+        @Override
+        public void encode(final OtpOutputStream buf) {
+            fail("unexpected encode() call");
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            fail("unexpected equals() call");
+            return false;
+        }
+
+        @Override
+        public <T> boolean match(final OtpErlangObject term, final T binds) {
+            return true;
+        }
+    }
+
+    private static class Binder {
+        // make object pair for match() testing
+        TestObject makeTest(final boolean flag) {
+            return new TestObject(flag, this, new DumbObject());
+        }
+
+        // make object pair for bind() testing
+        TestObject makeTest() {
+            return new TestObject(this, new BoundObject());
+        }
+    }
+
+    private static void isNotNull(final Object o) throws Exception {
+        if (o == null) {
+            throw new Exception("not null expected");
+        }
+    }
+
+    private static void fail(final String string) {
+        System.err.println(string);
+        new Throwable().printStackTrace(System.err);
+        System.exit(1);
+    }
+
+    private static void isT(final boolean b) throws Exception {
+        if (!b) {
+            throw new Exception("true expected");
+        }
+    }
+
+    private static void isF(final boolean b) throws Exception {
+        if (b) {
+            throw new Exception("false expected");
+        }
+    }
+
+    private static void equals(final OtpErlangObject a, final OtpErlangObject b)
+            throws Exception {
+        if (!a.equals(b)) {
+            throw new Exception(a + " != " + b);
+        }
+    }
+
+    /*
+     * scalar match test - match particular test object (producing given result)
+     * against particular dumb object passing particular bindings object; ensure
+     * all participants are used as expected in match behavior, check result.
+     */
+    private static void scalar_match_test() throws Exception {
+        final Binder bind = new Binder();
+
+        final TestObject t = bind.makeTest(true);
+        isT(t.match(t.getDumb(), bind));
+
+        final TestObject f = bind.makeTest(false);
+        isF(f.match(f.getDumb(), bind));
+    }
+
+    /*
+     * scalar bind test - ensure right object generated based on bindings
+     */
+    private static void scalar_bind_test() throws Exception {
+        final Binder bind = new Binder();
+        final TestObject t = bind.makeTest();
+        final OtpErlangObject o = t.bind(bind);
+        isNotNull(o);
+        equals(t, o);
+    }
+
+    /*
+     * used by tuple_arity_match_test()
+     */
+    private static OtpErlangObject mkTuplePattern(final int n) {
+        final Any a[] = new Any[n];
+        for (int i = 0; i < n; i++) {
+            a[i] = new Any();
+        }
+        return new OtpErlangTuple(a);
+    }
+
+    /*
+     * used by tuple_arity_match_test()
+     */
+    private static OtpErlangObject mkTupleObject(final int n) {
+        final DumbObject a[] = new DumbObject[n];
+        for (int i = 0; i < n; i++) {
+            a[i] = new DumbObject();
+        }
+        return new OtpErlangTuple(a);
+    }
+
+    /*
+     * ensure only tuples of the same arity can match
+     */
+    private static void tuple_arity_match_test(final int m, final int n)
+            throws Exception {
+        final Binder bind = new Binder();
+        for (int i = m; i < n; i++) {
+            for (int j = m; j < n; j++) {
+                final OtpErlangObject p = mkTuplePattern(i);
+                final OtpErlangObject o = mkTupleObject(j);
+                if (i == j) {
+                    isT(p.match(o, bind));
+                } else {
+                    isF(p.match(o, bind));
+                }
+            }
+        }
+    }
+
+    /*
+     * tuple match test - ensure elements of tuple are matched to corresponding
+     * elements of tested object and result is logical "and" over all elements.
+     */
+    private static void tuple_match_test(final int n) throws Exception {
+        final Binder bind = new Binder();
+        final int max = 1 << n;
+        final TestObject a[] = new TestObject[n];
+        final DumbObject d[] = new DumbObject[n];
+        for (int k = 0; k < max; k++) {
+            for (int m = 1, i = 0; m < max; m = m << 1, i++) {
+                d[i] = new DumbObject();
+                a[i] = new TestObject((k & m) != 0, bind, d[i]);
+            }
+            final OtpErlangObject tpl = new OtpErlangTuple(a);
+            final OtpErlangObject obj = new OtpErlangTuple(d);
+            if (k + 1 < max) {
+                isF(tpl.match(obj, bind));
+            } else {
+                isT(tpl.match(obj, bind));
+            }
+        }
+    }
+
+    /*
+     * tuple bind test - ensure result is a tuple where each element is a result
+     * of binding of corresponding pattern element using provided bindings.
+     */
+    private static void tuple_bind_test(final int n) throws Exception {
+        final Binder bind = new Binder();
+        final TestObject a[] = new TestObject[n];
+        final OtpErlangObject b[] = new OtpErlangObject[n];
+        for (int i = 0; i < n; i++) {
+            a[i] = bind.makeTest();
+            b[i] = a[i].obj;
+        }
+        final OtpErlangObject t = new OtpErlangTuple(a);
+        final OtpErlangObject o = t.bind(bind);
+        isNotNull(o);
+        equals(t, o);
+    }
+
+    private static OtpErlangObject mkListPattern(final int n, final boolean tail)
+            throws OtpErlangException {
+        final Any a[] = new Any[n];
+        for (int i = 0; i < n; i++) {
+            a[i] = new Any();
+        }
+        return tail ? new OtpErlangList(a, new Any()) : new OtpErlangList(a);
+    }
+
+    private static OtpErlangObject mkListObject(final int n, final boolean tail)
+            throws OtpErlangException {
+        final DumbObject a[] = new DumbObject[n];
+        for (int i = 0; i < n; i++) {
+            a[i] = new DumbObject();
+        }
+        return tail ? new OtpErlangList(a, new DumbObject())
+                : new OtpErlangList(a);
+    }
+
+    /*
+     * ensure only lists of the same arity and same tail presence can match
+     */
+    private static void list_arity_match_test(final int m, final int n)
+            throws Exception {
+        final Binder bind = new Binder();
+        for (int i = m; i < n; i++) {
+            for (int j = m; j < n; j++) {
+                for (int k = 0; k < 2; k++) {
+                    if (i == 0 && k == 1) {
+                        continue;
+                    }
+                    for (int l = 0; l < 2; l++) {
+                        if (j == 0 && l == 1) {
+                            continue;
+                        }
+                        final OtpErlangObject p = mkListPattern(i, k == 1);
+                        final OtpErlangObject o = mkListObject(j, l == 1);
+                        if (i == j && k == l || k == 1 && i <= j) {
+                            isT(p.match(o, bind));
+                        } else {
+                            isF(p.match(o, bind));
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /*
+     * lists match test - ensure elements of lists are matched to corresponding
+     * elements of tested object and result is logical "and" over all elements,
+     * count tails as well
+     */
+    private static void list_match_test(final int n) throws Exception {
+        final Binder bind = new Binder();
+        final int max = 1 << n;
+        final TestObject a[] = new TestObject[n];
+        final DumbObject d[] = new DumbObject[n];
+        final DumbObject e[] = new DumbObject[n + 1];
+        for (int k = 0; k < max; k++) {
+            for (int m = 1, i = 0; m < max; m = m << 1, i++) {
+                d[i] = new DumbObject();
+                e[i] = d[i];
+                a[i] = new TestObject((k & m) != 0, bind, d[i]);
+            }
+            for (int i = n; i < n + 1; i++) {
+                e[i] = new DumbObject();
+            }
+            final OtpErlangObject lst = new OtpErlangList(a);
+            final OtpErlangObject obj = new OtpErlangList(d);
+            final OtpErlangObject ext = new OtpErlangList(e);
+            final OtpErlangObject eTl = new OtpErlangList(e, new DumbObject());
+
+            if (n > 0) {
+                final DumbObject dTail = new DumbObject();
+                final TestObject tTail = new TestObject(true, bind, dTail);
+                final TestObject fTail = new TestObject(false, bind, dTail);
+                final OtpErlangObject fTailLst = new OtpErlangList(a, fTail);
+                final OtpErlangObject tTailLst = new OtpErlangList(a, tTail);
+                final OtpErlangObject tailObj = new OtpErlangList(d, dTail);
+
+                // match lists with non-matching tails is always false
+                isF(fTailLst.match(tailObj, bind));
+
+                // match list with no tail to list with tail is always false
+                isF(lst.match(tailObj, bind));
+
+                // matching lists with matching tails
+                if (k + 1 < max) {
+                    isF(tTailLst.match(tailObj, bind));
+                } else {
+                    isT(tTailLst.match(tailObj, bind));
+                }
+
+                // matching shorter pattern with last tail to longer list
+                // with or with no extra tail; matching list pattern
+                // with last tail to same length list with no tail.
+                final Any aTail = new Any();
+                final OtpErlangObject shortLst = new OtpErlangList(a, aTail);
+                if (k + 1 < max) {
+                    isF(shortLst.match(obj, bind)); // same arity
+                    isF(shortLst.match(ext, bind)); // pattern arity is less
+                    isF(shortLst.match(eTl, bind)); //
+                } else {
+                    isT(shortLst.match(obj, bind)); // same arity
+                    isT(shortLst.match(ext, bind)); // pattern arity is less
+                    isT(shortLst.match(eTl, bind)); //
+                }
+            }
+
+            // matching lists with no tails
+            if (k + 1 < max) {
+                isF(lst.match(obj, bind));
+            } else {
+                isT(lst.match(obj, bind));
+            }
+
+            // extra-length object, no tail in "pattern"
+            isF(lst.match(ext, bind));
+        }
+    }
+
+    /*
+     * list bind test - ensure result is a list where each element is a result
+     * of binding of corresponding pattern element using provided bindings.
+     */
+    private static void list_bind_test(final int n) throws Exception {
+        final Binder bind = new Binder();
+        final TestObject a[] = new TestObject[n];
+        final OtpErlangObject b[] = new OtpErlangObject[n];
+        for (int i = 0; i < n; i++) {
+            a[i] = bind.makeTest();
+            b[i] = a[i].obj;
+        }
+        OtpErlangObject t = new OtpErlangList(a);
+        OtpErlangObject o = t.bind(bind);
+        isNotNull(o);
+        equals(t, o);
+        if (n > 0) {
+            // improper list case
+            t = new OtpErlangList(a, bind.makeTest());
+            o = t.bind(bind);
+            isNotNull(o);
+            equals(t, o);
+        }
+    }
+
+    /*
+     * map match test - object may have more keys than pattern
+     */
+    private static void map_match_test(final int m, final int n)
+            throws Exception {
+        final Binder bind = new Binder();
+
+        // pattern side - m elements
+        final OtpErlangObject k1[] = new OtpErlangObject[m];
+        final TestObject a[] = new TestObject[m];
+
+        // object side - n elements
+        final OtpErlangObject k2[] = new OtpErlangObject[n];
+        final DumbObject d[] = new DumbObject[n];
+
+        final int max = Math.max(m, n);
+        final int mskHi = 1 << max;
+        final int full = (1 << m) - 1;
+        for (int k = 0; k < mskHi; k++) {
+            for (int msk = 1, i = 0; msk < mskHi; msk = msk << 1, i++) {
+                if (i < n) {
+                    k2[i] = new OtpErlangInt(i);
+                    d[i] = new DumbObject();
+                }
+                if (i < m) {
+                    k1[i] = new OtpErlangInt(i);
+                    a[i] = new TestObject((k & msk) != 0, bind, i < n ? d[i]
+                            : new DumbObject());
+                }
+            }
+            final OtpErlangObject map = new OtpErlangMap(k1, a); // m items
+            final OtpErlangObject obj = new OtpErlangMap(k2, d); // n items
+            if ((k & full) == full && m <= n) {
+                isT(map.match(obj, bind));
+            } else {
+                isF(map.match(obj, bind));
+            }
+        }
+    }
+
+    /*
+     * map bind test - ensure result is a map where each element is a result of
+     * binding of corresponding pattern element using provided bindings.
+     */
+    private static void map_bind_test(final int n) throws Exception {
+        final Binder bind = new Binder();
+        final TestObject a[] = new TestObject[n];
+        final OtpErlangObject b[] = new OtpErlangObject[n];
+        final OtpErlangObject k[] = new OtpErlangObject[n];
+        for (int i = 0; i < n; i++) {
+            a[i] = bind.makeTest();
+            b[i] = a[i].obj;
+            k[i] = new OtpErlangInt(i);
+        }
+        final OtpErlangObject t = new OtpErlangMap(k, a);
+        final OtpErlangObject o = t.bind(bind);
+        isNotNull(o);
+        equals(t, o);
+    }
+
+    public static void main(final String[] args) {
+        try {
+            scalar_match_test();
+            System.out.println("scalar_match_test() passed");
+
+            scalar_bind_test();
+            System.out.println("scalar_bind_test() passed");
+
+            for (int m = 0; m < 16; m++) {
+                for (int n = 0; n < 16; n++) {
+                    tuple_arity_match_test(m, n);
+                }
+            }
+            System.out.println("tuple_arity_match_test() passed");
+
+            for (int n = 0; n < 16; n++) {
+                tuple_match_test(n);
+            }
+            System.out.println("tuple_match_test() passed");
+
+            for (int n = 0; n < 16; n++) {
+                tuple_bind_test(n);
+            }
+            System.out.println("tuple_bind_test() passed");
+
+            for (int m = 0; m < 16; m++) {
+                for (int n = 0; n < 16; n++) {
+                    list_arity_match_test(m, n);
+                }
+            }
+            System.out.println("list_arity_match_test() passed");
+
+            for (int n = 0; n < 16; n++) {
+                list_match_test(n);
+            }
+            System.out.println("list_match_test() passed");
+
+            for (int n = 0; n < 16; n++) {
+                list_bind_test(n);
+            }
+            System.out.println("list_bind_test() passed");
+
+            for (int m = 0; m < 12; m++) {
+                for (int n = 0; n < 12; n++) {
+                    map_match_test(m, n);
+                }
+            }
+            System.out.println("map_match_test() passed");
+
+            for (int n = 0; n < 16; n++) {
+                map_bind_test(n);
+            }
+            System.out.println("map_bind_test() passed");
+
+        } catch (final Exception e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+
+        System.out.println("ok");
+    }
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/FunEquals.java b/lib/jinterface/test/jinterface_SUITE_data/FunEquals.java
index 961e462cb3..e15ba30a52 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/FunEquals.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/FunEquals.java
@@ -3,16 +3,17 @@
  *
  * Copyright Ericsson AB 2004-2010. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/jinterface/test/jinterface_SUITE_data/GetNames.java b/lib/jinterface/test/jinterface_SUITE_data/GetNames.java
index 54efaad242..87a27f71ab 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/GetNames.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/GetNames.java
@@ -3,16 +3,17 @@
  *
  * Copyright Ericsson AB 2004-2010. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/jinterface/test/jinterface_SUITE_data/Makefile.src b/lib/jinterface/test/jinterface_SUITE_data/Makefile.src
index cd68f1ead5..94625da188 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/Makefile.src
+++ b/lib/jinterface/test/jinterface_SUITE_data/Makefile.src
@@ -3,16 +3,17 @@
 #
 # Copyright Ericsson AB 2004-2010. All Rights Reserved.
 #
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # %CopyrightEnd%
 #
@@ -38,6 +39,7 @@ JINTERFACE_CLASSPATH = @jinterface_classpath@
 CLASSPATH = .@PS@$(JINTERFACE_CLASSPATH)@PS@
 
 JAVA_FILES = \
+	TransportFactoryTest.java \
 	Nodename.java \
 	RegisterAndWhereis.java \
 	GetNames.java \
@@ -48,7 +50,8 @@ JAVA_FILES = \
 	MboxLinkUnlink.java \
 	NodeStatusHandler.java \
 	Maps.java \
-	FunEquals.java
+	FunEquals.java \
+	CoreMatchBind.java
 
 CLASS_FILES = $(JAVA_FILES:.java=.class)
 
diff --git a/lib/jinterface/test/jinterface_SUITE_data/Maps.java b/lib/jinterface/test/jinterface_SUITE_data/Maps.java
index 653defc621..e31b476e02 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/Maps.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/Maps.java
@@ -13,16 +13,17 @@ import com.ericsson.otp.erlang.OtpOutputStream;
  *
  * Copyright Ericsson AB 2004-2010. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java b/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java
index 470fdb4a14..7042b6297d 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java
@@ -3,16 +3,17 @@
  *
  * Copyright Ericsson AB 2004-2010. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/jinterface/test/jinterface_SUITE_data/MboxPing.java b/lib/jinterface/test/jinterface_SUITE_data/MboxPing.java
index 3a8497028e..13e2c8edc4 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/MboxPing.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/MboxPing.java
@@ -3,16 +3,17 @@
  *
  * Copyright Ericsson AB 2004-2010. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java b/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java
index 44433aa619..67ab6b13aa 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java
@@ -3,16 +3,17 @@
  *
  * Copyright Ericsson AB 2004-2010. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/jinterface/test/jinterface_SUITE_data/NodePing.java b/lib/jinterface/test/jinterface_SUITE_data/NodePing.java
index d0df5c46b5..5938f2b335 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/NodePing.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/NodePing.java
@@ -3,16 +3,17 @@
  *
  * Copyright Ericsson AB 2004-2010. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java b/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java
index 06ddfa2d61..bb21fa85ad 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java
@@ -3,16 +3,17 @@
  *
  * Copyright Ericsson AB 2004-2010. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/jinterface/test/jinterface_SUITE_data/Nodename.java b/lib/jinterface/test/jinterface_SUITE_data/Nodename.java
index dc8cb9c49f..770431a414 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/Nodename.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/Nodename.java
@@ -3,16 +3,17 @@
  *
  * Copyright Ericsson AB 2004-2010. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/jinterface/test/jinterface_SUITE_data/RegisterAndWhereis.java b/lib/jinterface/test/jinterface_SUITE_data/RegisterAndWhereis.java
index 9df01981b2..3612460cce 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/RegisterAndWhereis.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/RegisterAndWhereis.java
@@ -3,16 +3,17 @@
  *
  * Copyright Ericsson AB 2004-2010. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/jinterface/test/jinterface_SUITE_data/TransportFactoryTest.java b/lib/jinterface/test/jinterface_SUITE_data/TransportFactoryTest.java
new file mode 100644
index 0000000000..6f5b94832e
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/TransportFactoryTest.java
@@ -0,0 +1,91 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2015. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+import java.io.IOException;
+import java.net.InetAddress;
+
+import com.ericsson.otp.erlang.OtpSelf;
+import com.ericsson.otp.erlang.OtpServerTransport;
+import com.ericsson.otp.erlang.OtpSocketTransportFactory;
+import com.ericsson.otp.erlang.OtpTransport;
+import com.ericsson.otp.erlang.OtpTransportFactory;
+
+/**
+ * @author Dmitriy Kargapolov
+ */
+public class TransportFactoryTest {
+
+    /**
+     * example of custom transport factory wrapping default one
+     */
+    public static class TransportFactory implements OtpTransportFactory {
+
+        OtpSocketTransportFactory tf = new OtpSocketTransportFactory();
+
+        public OtpTransport createTransport(final String addr, final int port)
+                throws IOException {
+            clientOk = true;
+            System.out.println("creating transport to " + addr + ", " + port);
+            return tf.createTransport(addr, port);
+        }
+
+        public OtpTransport createTransport(final InetAddress addr,
+                final int port) throws IOException {
+            clientOk = true;
+            System.out.println("creating transport to " + addr + ", " + port);
+            return tf.createTransport(addr, port);
+        }
+
+        public OtpServerTransport createServerTransport(final int port)
+                throws IOException {
+            serverOk = true;
+            System.out.println("creating server transport to " + port);
+            return tf.createServerTransport(port);
+        }
+
+    }
+
+    static boolean serverOk = false;
+    static boolean clientOk = false;
+
+    public static void main(final String[] args) throws IOException {
+
+        // check server transport
+        final OtpSelf self = new OtpSelf("local", new TransportFactory());
+        if (!serverOk) {
+            fail("custom server transport was not created");
+        }
+        System.out.println("accepting connections on " + self.port());
+
+        // check client transport
+        try {
+            self.publishPort();
+        } catch (final Exception e) {
+        }
+        if (!clientOk) {
+            fail("custom client transport was not created");
+        }
+    }
+
+    private static void fail(final String string) {
+        System.err.println(string);
+        System.exit(1);
+    }
+}
diff --git a/lib/jinterface/test/jitu.erl b/lib/jinterface/test/jitu.erl
index 46b8cb3ac2..adcadac85e 100644
--- a/lib/jinterface/test/jitu.erl
+++ b/lib/jinterface/test/jitu.erl
@@ -3,16 +3,17 @@
 %%
 %% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -117,10 +118,7 @@ classpath(Dir) ->
 	end,
     es(Dir++PS++
 	filename:join([code:lib_dir(jinterface),"priv","OtpErlang.jar"])++PS++
-	case os:getenv("CLASSPATH") of
-	    false -> "";
-	    Classpath -> Classpath
-	end,
+	os:getenv("CLASSPATH", ""),
        Quote,
        EscSpace).
 
diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl
index 9f37b33718..9679b90a0d 100644
--- a/lib/jinterface/test/nc_SUITE.erl
+++ b/lib/jinterface/test/nc_SUITE.erl
@@ -3,16 +3,17 @@
 %%
 %% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
diff --git a/lib/jinterface/test/nc_SUITE_data/.gitignore b/lib/jinterface/test/nc_SUITE_data/.gitignore
new file mode 100644
index 0000000000..6b468b62a9
--- /dev/null
+++ b/lib/jinterface/test/nc_SUITE_data/.gitignore
@@ -0,0 +1 @@
+*.class
diff --git a/lib/jinterface/test/nc_SUITE_data/Makefile.src b/lib/jinterface/test/nc_SUITE_data/Makefile.src
index 3d131250be..3d02389df8 100644
--- a/lib/jinterface/test/nc_SUITE_data/Makefile.src
+++ b/lib/jinterface/test/nc_SUITE_data/Makefile.src
@@ -3,16 +3,17 @@
 #
 # Copyright Ericsson AB 2004-2010. All Rights Reserved.
 #
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # %CopyrightEnd%
 #
diff --git a/lib/jinterface/test/nc_SUITE_data/connection_server.java b/lib/jinterface/test/nc_SUITE_data/connection_server.java
index 19ed1c7d5c..36c5074031 100644
--- a/lib/jinterface/test/nc_SUITE_data/connection_server.java
+++ b/lib/jinterface/test/nc_SUITE_data/connection_server.java
@@ -3,16 +3,17 @@
  *
  * Copyright Ericsson AB 2004-2010. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/jinterface/test/nc_SUITE_data/echo_server.java b/lib/jinterface/test/nc_SUITE_data/echo_server.java
index 0e43ea0680..4caf0dedde 100644
--- a/lib/jinterface/test/nc_SUITE_data/echo_server.java
+++ b/lib/jinterface/test/nc_SUITE_data/echo_server.java
@@ -3,16 +3,17 @@
  *
  * Copyright Ericsson AB 2004-2012. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */