From cfb723df3d05be98e9e22bf75b3eb8f66894a362 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Fri, 2 Dec 2016 18:40:54 +0200 Subject: [PATCH 01/53] Configured the `aggregate-add-third-party-mojo` plugin Added .ftl file to match the output with the existing Notice.txt file --- pom.xml | 22 +++++++++++++++-- third-party-template.ftl | 51 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 third-party-template.ftl diff --git a/pom.xml b/pom.xml index 76fdee409b..971a9bffbe 100644 --- a/pom.xml +++ b/pom.xml @@ -376,7 +376,7 @@ - + + JDOM @@ -409,6 +409,24 @@ + --> + + org.codehaus.mojo + license-maven-plugin + 1.10 + + target + Notice.txt + ${project.basedir}/third-party-template.ftl + + + + + aggregate-add-third-party + + generate-resources + + diff --git a/third-party-template.ftl b/third-party-template.ftl new file mode 100644 index 0000000000..67cb83c353 --- /dev/null +++ b/third-party-template.ftl @@ -0,0 +1,51 @@ +<#-- + #%L + License Maven Plugin + %% + Copyright (C) 2012 Codehaus, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + . + #L% + --> +<#-- To render the third-party file. + Available context : + + - dependencyMap a collection of Map.Entry with + key are dependencies (as a MavenProject) (from the maven project) + values are licenses of each dependency (array of string) + + - licenseMap a collection of Map.Entry with + key are licenses of each dependency (array of string) + values are all dependencies using this license +--> +<#function artifactFormat p> + <#assign header = "This product depends on " + p.name + " " + p.version + "\n\n"/> + <#assign mvnLicense = "\tLicense:\t"/> + <#if !p.getLicenses()?has_content> + <#assign mvnLicense = mvnLicense + "null (null)\n"/> + <#else> + <#list p.getLicenses() as license> + <#assign mvnLicense = mvnLicense + license.url + " (" + license.name + ")\n"/> + + + <#assign homepage = "\tHomepage:\t" + (p.url!"null") + "\n"/> + <#return header + mvnLicense + homepage> + + +<#list dependencyMap as e> + <#assign project = e.getKey()/> + <#assign licenses = e.getValue()/> +${artifactFormat(project)} + From 584abb253e2365d21e430b20f793baed4075b578 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Mon, 5 Dec 2016 18:49:10 +0200 Subject: [PATCH 02/53] Changed plugin configuration to build from parent pom Added null check in ftl template --- pom.xml | 4 ++-- third-party-template.ftl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 971a9bffbe..c269ddc7df 100644 --- a/pom.xml +++ b/pom.xml @@ -416,8 +416,8 @@ 1.10 target - Notice.txt - ${project.basedir}/third-party-template.ftl + NOTICE.txt + ${session.executionRootDirectory}/third-party-template.ftl diff --git a/third-party-template.ftl b/third-party-template.ftl index 67cb83c353..ac25913b1e 100644 --- a/third-party-template.ftl +++ b/third-party-template.ftl @@ -37,7 +37,7 @@ <#assign mvnLicense = mvnLicense + "null (null)\n"/> <#else> <#list p.getLicenses() as license> - <#assign mvnLicense = mvnLicense + license.url + " (" + license.name + ")\n"/> + <#assign mvnLicense = mvnLicense + (license.url!"null") + " (" + license.name + ")\n"/> <#assign homepage = "\tHomepage:\t" + (p.url!"null") + "\n"/> From f06a27a085bc8f8ec6da690d81957aab4edce63a Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Tue, 6 Dec 2016 19:44:10 +0200 Subject: [PATCH 03/53] Changed loading of the ftl file from a separate maven module in the community repository --- pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c269ddc7df..1a7e47c01e 100644 --- a/pom.xml +++ b/pom.xml @@ -417,8 +417,21 @@ target NOTICE.txt - ${session.executionRootDirectory}/third-party-template.ftl + org/kaazing/community/notice/third-party-template.ftl + + + + org.kaazing + community.notice + jar + + develop-SNAPSHOT + + From 14ed334075ae64510f0e796a2a61304bcda31924 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Tue, 13 Dec 2016 17:25:24 +0200 Subject: [PATCH 04/53] Added configuration and missing licenses information for the distribution module Added the generated Notice.txt file in `distribution/src/main/gateway` --- distribution/pom.xml | 12 + .../src/license/THIRD-PARTY.properties | 25 + distribution/src/main/gateway/NOTICE.txt | 445 ++++++++++++++++++ pom.xml | 39 -- third-party-template.ftl | 51 -- 5 files changed, 482 insertions(+), 90 deletions(-) create mode 100644 distribution/src/license/THIRD-PARTY.properties create mode 100644 distribution/src/main/gateway/NOTICE.txt delete mode 100644 third-party-template.ftl diff --git a/distribution/pom.xml b/distribution/pom.xml index 515f45fb46..85057169ec 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -241,6 +241,16 @@ + + org.codehaus.mojo + license-maven-plugin + 1.10 + + true + true + src/license/THIRD-PARTY.properties + + org.apache.maven.plugins maven-assembly-plugin @@ -275,6 +285,8 @@ src/main/gateway/web/**/* src/main/gateway/README.txt + src/main/gateway/NOTICE.txt + src/license/THIRD-PARTY.properties diff --git a/distribution/src/license/THIRD-PARTY.properties b/distribution/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000000..f2401f489e --- /dev/null +++ b/distribution/src/license/THIRD-PARTY.properties @@ -0,0 +1,25 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2 +# - Apache 2.0 License +# - Apache License, Version 2.0 +# - BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +# - Eclipse Public License 1.0 +# - MIT License +# - MPL 1.1 +# - New BSD License +# - The Apache License, Version 2.0 +# - The Apache Software License, Version 2.0 +# - The BSD License +# - http://www.gnu.org/licenses/licenses.html (LGPL) +# - https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt (JDOM License) +# - provided without support or warranty +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Dec 13 15:38:06 EET 2016 +net.java.dev.jna--jna--3.3.0=http\://www.gnu.org/licenses/licenses.html (LGPL) +ognl--ognl--2.7.2=http\://www.apache.org/licenses/ (Apache License 2) +org.jdom--jdom--1.1=https\://github.com/hunterhacker/jdom/blob/master/LICENSE.txt (JDOM License) diff --git a/distribution/src/main/gateway/NOTICE.txt b/distribution/src/main/gateway/NOTICE.txt new file mode 100644 index 0000000000..67a75dc3f0 --- /dev/null +++ b/distribution/src/main/gateway/NOTICE.txt @@ -0,0 +1,445 @@ +This product depends on FindBugs-jsr305 2.0.1 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://findbugs.sourceforge.net/ + +This product depends on hazelcast 1.9.4.8 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://www.hazelcast.com/hazelcast/ + +This product depends on hazelcast-client 1.9.4.8 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://www.hazelcast.com/hazelcast-client/ + +This product depends on hazelcast-cloud 1.9.4.8 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://www.hazelcast.com/hazelcast-cloud/ + +This product depends on Commons CLI 1.2 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://commons.apache.org/cli/ + +This product depends on Commons IO 2.4 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://commons.apache.org/io/ + +This product depends on Java Unified Expression Language API 2.2.7 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://juel.sourceforge.net/juel-api/ + +This product depends on Java Unified Expression Language Implementation 2.2.7 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://juel.sourceforge.net/juel-impl/ + +This product depends on Netty 3.10.5.Final + + License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + Homepage: http://netty.io/ + +This product depends on Javassist 3.7.ga + + License: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/jboss/javassist/License.html?rev=HEAD&content-type=text/html (MPL 1.1) + Homepage: http://labs.jboss.com/javassist/ + +This product depends on JUnit 4.12 + + License: http://www.eclipse.org/legal/epl-v10.html (Eclipse Public License 1.0) + Homepage: http://junit.org + +This product depends on Apache Log4j 1.2.17 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://logging.apache.org/log4j/1.2/ + +This product depends on Java Native Access 3.3.0 + + License: http://www.gnu.org/licenses/licenses.html (LGPL) + Homepage: Home page is not included in maven artifact, and thus couldn't be referenced here + +This product depends on opencsv 2.3 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: http://opencsv.sf.net + +This product depends on OGNL - Object Graph Navigation Library 2.7.2 + + License: http://www.apache.org/licenses/ (Apache License 2) + Homepage: http://ognl.org + +This product depends on abego TreeLayout Core 1.0.1 + + License: http://treelayout.googlecode.com/files/LICENSE.TXT (BSD 3-Clause "New" or "Revised" License (BSD-3-Clause)) + Homepage: http://code.google.com/p/treelayout/ + +This product depends on ANTLR 4 Runtime Annotations 4.2.2 + + License: http://www.antlr.org/license.html (The BSD License) + Homepage: http://www.antlr.org/antlr4-annotations + +This product depends on ANTLR 4 Runtime 4.2.2 + + License: http://www.antlr.org/license.html (The BSD License) + Homepage: http://www.antlr.org/antlr4-runtime + +This product depends on Apache Maven Shared Utils 3.0.0 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache License, Version 2.0) + Homepage: http://maven.apache.org/shared/maven-shared-utils/ + +This product depends on XmlBeans 2.4.0 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://xmlbeans.apache.org + +This product depends on Hamcrest Core 1.3 + + License: http://www.opensource.org/licenses/bsd-license.php (New BSD License) + Homepage: https://github.com/hamcrest/JavaHamcrest/hamcrest-core + +This product depends on JDOM 1.1 + + License: https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt (JDOM License) + Homepage: http://www.jdom.org/ + +This product depends on JSON (JavaScript Object Notation) 20090211 + + License: http://www.json.org/license.html (provided without support or warranty) + Homepage: http://www.json.org/java/index.html + +This product depends on Kaazing Corporation License 2.18 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/community + +This product depends on Kaazing Gateway Bridge develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway/bridge/gateway.bridge + +This product depends on Kaazing WebSocket Gateway - Java Client Bridge 5.0.0.5 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.client.java.bridge + +This product depends on Kaazing WebSocket Gateway - Java Client Transport 5.0.0.6 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.client.java.transport.git + +This product depends on Kaazing Gateway Client Javascript Bridge Packaging develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway/bridge/gateway.client.javascript.bridge + +This product depends on Kaazing WebSocket Gateway - Management develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.management.git + +This product depends on Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.git + +This product depends on Http Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.http.git + +This product depends on Httpx Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.httpx.git + +This product depends on Httpxdraft Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.httpxdraft.git + +This product depends on Httpxe Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.httpxe.git + +This product depends on Pipe Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.pipe.git + +This product depends on Rtmp Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.rtmp.git + +This product depends on Sse Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.sse.git + +This product depends on Ssl Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.ssl.git + +This product depends on Tcp Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.tcp.git + +This product depends on Udp Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.udp.git + +This product depends on Ws Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.ws.git + +This product depends on Wsdraft Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.wsdraft.git + +This product depends on Wse Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.wse.git + +This product depends on Wsn Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.wsn.git + +This product depends on Wsx Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.wsx.git + +This product depends on Wsxdraft Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.wsxdraft.git + +This product depends on Gateway Security develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.security.git + +This product depends on Kaazing WebSocket Gateway - Server develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.server.git + +This product depends on Kaazing WebSocket Gateway - Server API develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.server.api.git + +This product depends on Kaazing WebSocket Gateway - Server Service Provider Interface develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.server.spi.git + +This product depends on Gateway Service develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.service.git + +This product depends on Kaazing WebSocket Gateway - AMQP Service develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/amqp.server.git + +This product depends on Broadcast Service develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.service.broadcast.git + +This product depends on Echo Service develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.service.echo.git + +This product depends on Http Balancer Service develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.service.http.balancer.git + +This product depends on Http Directory Service develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.service.http.directory.git + +This product depends on Http Proxy Service develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway/service/gateway.service.http.proxy + +This product depends on Proxy Service develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.service.proxy.git + +This product depends on TURN REST Service develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.service.turn.rest.git + +This product depends on Update Check Service develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.service.update.check.git + +This product depends on Update Check Management Service develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.service.update.check.management.git + +This product depends on Transport Core develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.transport.git + +This product depends on BIO Transport develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.transport.bio.git + +This product depends on Http Transport develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.transport.http.git + +This product depends on NIO Transport develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.transport.nio.git + +This product depends on Pipe Transport develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.transport.pipe.git + +This product depends on Sse Transport develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.transport.sse.git + +This product depends on SSL Transport develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.transport.ssl.git + +This product depends on WS Transport develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.transport.ws.git + +This product depends on WSEB Transport develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.transport.wseb.git + +This product depends on WSN Transport develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.transport.wsn.git + +This product depends on Kaazing WebSocket Gateway - Truststore 1.0.0.81 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.truststore.git + +This product depends on Gateway Utils develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.util.git + +This product depends on k3po/junit 3.0.0-alpha-55 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/k3po + +This product depends on k3po/lang 3.0.0-alpha-55 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/k3po + +This product depends on Apache MINA Core develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) + Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-core + +This product depends on Apache MINA JavaBeans Integration develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) + Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-beans + +This product depends on Apache MINA JMX Integration develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) + Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-jmx + +This product depends on Apache MINA OGNL Integration develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) + Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-ognl + +This product depends on Mina Netty Adapter develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/mina.netty.git + +This product depends on Net API 1.1.0.9 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/net.api/net.api + +This product depends on Net TCP Implementation 1.1.0.9 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/net.api/net.tcp + +This product depends on SNMP4J 1.11.3 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: https://github.com/kaazing/snmp4j + +This product depends on SNMP4J-Agent 1.4.3 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: https://github.com/kaazing/snmp4j.agent + +This product depends on Test Utils develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/test.util.git + +This product depends on SLF4J API Module 1.7.21 + + License: http://www.opensource.org/licenses/mit-license.php (MIT License) + Homepage: http://www.slf4j.org + +This product depends on SLF4J LOG4J-12 Binding 1.7.21 + + License: http://www.opensource.org/licenses/mit-license.php (MIT License) + Homepage: http://www.slf4j.org + +This product depends on StAX API 1.0.1 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://stax.codehaus.org/ + +This product depends on Agrona 0.4.12 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache License, Version 2.0) + Homepage: https://github.com/real-logic/Agrona + diff --git a/pom.xml b/pom.xml index 1a7e47c01e..c7cbd83310 100644 --- a/pom.xml +++ b/pom.xml @@ -376,40 +376,6 @@ - org.codehaus.mojo license-maven-plugin @@ -421,14 +387,9 @@ - org.kaazing community.notice jar - develop-SNAPSHOT diff --git a/third-party-template.ftl b/third-party-template.ftl deleted file mode 100644 index ac25913b1e..0000000000 --- a/third-party-template.ftl +++ /dev/null @@ -1,51 +0,0 @@ -<#-- - #%L - License Maven Plugin - %% - Copyright (C) 2012 Codehaus, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - . - #L% - --> -<#-- To render the third-party file. - Available context : - - - dependencyMap a collection of Map.Entry with - key are dependencies (as a MavenProject) (from the maven project) - values are licenses of each dependency (array of string) - - - licenseMap a collection of Map.Entry with - key are licenses of each dependency (array of string) - values are all dependencies using this license ---> -<#function artifactFormat p> - <#assign header = "This product depends on " + p.name + " " + p.version + "\n\n"/> - <#assign mvnLicense = "\tLicense:\t"/> - <#if !p.getLicenses()?has_content> - <#assign mvnLicense = mvnLicense + "null (null)\n"/> - <#else> - <#list p.getLicenses() as license> - <#assign mvnLicense = mvnLicense + (license.url!"null") + " (" + license.name + ")\n"/> - - - <#assign homepage = "\tHomepage:\t" + (p.url!"null") + "\n"/> - <#return header + mvnLicense + homepage> - - -<#list dependencyMap as e> - <#assign project = e.getKey()/> - <#assign licenses = e.getValue()/> -${artifactFormat(project)} - From bc3bf44db23d433e149a778425a7e1fc67ae1c65 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Wed, 14 Dec 2016 17:12:48 +0200 Subject: [PATCH 05/53] Updated license plugin configuration to only run from the top level and the distribution modules --- distribution/pom.xml | 12 +++++++++++- pom.xml | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 85057169ec..6873c9db60 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -244,12 +244,22 @@ org.codehaus.mojo license-maven-plugin - 1.10 + target + NOTICE.txt true + org/kaazing/community/notice/third-party-template.ftl true src/license/THIRD-PARTY.properties + + + + add-third-party + + generate-resources + + org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index c7cbd83310..a5d716c445 100644 --- a/pom.xml +++ b/pom.xml @@ -380,9 +380,11 @@ org.codehaus.mojo license-maven-plugin 1.10 + false target NOTICE.txt + true org/kaazing/community/notice/third-party-template.ftl From afd78f34c1e7646f2875e0a699d2143f03fa5ca4 Mon Sep 17 00:00:00 2001 From: apirvu Date: Fri, 16 Dec 2016 13:12:23 +0200 Subject: [PATCH 06/53] Accept on http instead of tcp --- .../http/proxy/auth/http.proxy.auth.authentication.basic.rpt | 4 ++-- .../http/proxy/auth/http.proxy.auth.authentication.digest.rpt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt index aaee35b270..5492a3d0eb 100644 --- a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt +++ b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt @@ -18,7 +18,7 @@ # client # -connect tcp://localhost:8110 +connect http://localhost:8110 connected write "GET /basic-auth/user/passwd HTTP/1.1\r\n" @@ -62,7 +62,7 @@ closed # server # -accept tcp://localhost:8080 +accept http://localhost:8080 accepted connected diff --git a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt index 10c5447ab3..3adecc6251 100644 --- a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt +++ b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt @@ -18,7 +18,7 @@ # client # -connect tcp://localhost:8110 +connect http://localhost:8110 connected write "GET /digest-auth/auth/user/passwd HTTP/1.1\r\n" @@ -66,7 +66,7 @@ closed # server # -accept tcp://localhost:8080 +accept http://localhost:8080 accepted connected From 8a0950caeadba47cc226108960893fb28efd6548 Mon Sep 17 00:00:00 2001 From: apirvu Date: Fri, 16 Dec 2016 17:05:27 +0200 Subject: [PATCH 07/53] Added http and path to auth basic and digest --- .../proxy/auth/http.proxy.auth.authentication.basic.rpt | 6 +++--- .../proxy/auth/http.proxy.auth.authentication.digest.rpt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt index 5492a3d0eb..fe5ddf2478 100644 --- a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt +++ b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt @@ -18,7 +18,7 @@ # client # -connect http://localhost:8110 +connect http://localhost:8110/hello connected write "GET /basic-auth/user/passwd HTTP/1.1\r\n" @@ -62,7 +62,7 @@ closed # server # -accept http://localhost:8080 +accept http://localhost:8080/hello accepted connected @@ -113,4 +113,4 @@ read "Accept: */*;q=0.8\r\n" read "\r\n" write status "200" "OK" -write close +write close \ No newline at end of file diff --git a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt index 3adecc6251..ef2acb97c4 100644 --- a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt +++ b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt @@ -18,7 +18,7 @@ # client # -connect http://localhost:8110 +connect http://localhost:8110/hello connected write "GET /digest-auth/auth/user/passwd HTTP/1.1\r\n" @@ -66,7 +66,7 @@ closed # server # -accept http://localhost:8080 +accept http://localhost:8080/hello accepted connected From c5c5d9cd976bd3c3646689a66a997209fb6f0b7d Mon Sep 17 00:00:00 2001 From: Jitendra Kotamraju Date: Fri, 16 Dec 2016 14:18:11 -0800 Subject: [PATCH 08/53] Upgrading to agrona 0.9.0 (it is package names are different) --- distribution/src/main/assembly/generic-bin.xml | 2 +- management/pom.xml | 2 +- .../monitoring/configuration/MonitorFileWriter.java | 2 +- .../configuration/impl/MMFMonitoringDataManager.java | 2 +- .../configuration/impl/MonitorFileWriterImpl.java | 6 +++--- .../monitoring/entity/impl/AgronaLongMonitoringCounter.java | 2 +- .../entity/impl/AgronaMonitoringEntityFactory.java | 4 ++-- .../management/monitoring/writer/impl/MMFGatewayWriter.java | 4 ++-- .../management/monitoring/writer/impl/MMFServiceWriter.java | 4 ++-- .../configuration/impl/MonitorFileWriterImplTest.java | 2 +- .../entity/impl/AgronaMonitoringEntityFactoryTest.java | 2 +- mina.netty/pom.xml | 4 ++-- .../jboss/netty/channel/socket/nio/AbstractNioSelector.java | 4 ++-- .../jboss/netty/channel/socket/nio/AbstractNioWorker.java | 2 +- pom.xml | 4 ++-- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/distribution/src/main/assembly/generic-bin.xml b/distribution/src/main/assembly/generic-bin.xml index 7917fa4922..69281db739 100644 --- a/distribution/src/main/assembly/generic-bin.xml +++ b/distribution/src/main/assembly/generic-bin.xml @@ -90,7 +90,7 @@ lib false - uk.co.real-logic:Agrona + org.agrona:Agrona org.jdom:jdom org.slf4j:slf4j-api org.slf4j:slf4j-log4j12 diff --git a/management/pom.xml b/management/pom.xml index 87591b1920..6855e0bf7f 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -144,7 +144,7 @@ snmp4j - uk.co.real-logic + org.agrona Agrona diff --git a/management/src/main/java/org/kaazing/gateway/management/monitoring/configuration/MonitorFileWriter.java b/management/src/main/java/org/kaazing/gateway/management/monitoring/configuration/MonitorFileWriter.java index 4860c185b1..969ec1440e 100644 --- a/management/src/main/java/org/kaazing/gateway/management/monitoring/configuration/MonitorFileWriter.java +++ b/management/src/main/java/org/kaazing/gateway/management/monitoring/configuration/MonitorFileWriter.java @@ -20,7 +20,7 @@ import org.kaazing.gateway.management.monitoring.service.MonitoredService; import org.kaazing.gateway.service.MonitoringEntityFactory; -import uk.co.real_logic.agrona.concurrent.UnsafeBuffer; +import org.agrona.concurrent.UnsafeBuffer; /** * MonitoringFileWriter interface responsible with writing data to monitoring files diff --git a/management/src/main/java/org/kaazing/gateway/management/monitoring/configuration/impl/MMFMonitoringDataManager.java b/management/src/main/java/org/kaazing/gateway/management/monitoring/configuration/impl/MMFMonitoringDataManager.java index effa442daf..893104ba9f 100644 --- a/management/src/main/java/org/kaazing/gateway/management/monitoring/configuration/impl/MMFMonitoringDataManager.java +++ b/management/src/main/java/org/kaazing/gateway/management/monitoring/configuration/impl/MMFMonitoringDataManager.java @@ -23,7 +23,7 @@ import org.kaazing.gateway.management.monitoring.service.MonitoredService; import org.kaazing.gateway.service.MonitoringEntityFactory; -import uk.co.real_logic.agrona.IoUtil; +import org.agrona.IoUtil; /** * Implementation of the monitoring MMF manager. diff --git a/management/src/main/java/org/kaazing/gateway/management/monitoring/configuration/impl/MonitorFileWriterImpl.java b/management/src/main/java/org/kaazing/gateway/management/monitoring/configuration/impl/MonitorFileWriterImpl.java index 81ac0249a8..8bd79fe722 100644 --- a/management/src/main/java/org/kaazing/gateway/management/monitoring/configuration/impl/MonitorFileWriterImpl.java +++ b/management/src/main/java/org/kaazing/gateway/management/monitoring/configuration/impl/MonitorFileWriterImpl.java @@ -27,9 +27,9 @@ import org.kaazing.gateway.management.monitoring.writer.impl.MMFServiceWriter; import org.kaazing.gateway.service.MonitoringEntityFactory; -import uk.co.real_logic.agrona.BitUtil; -import uk.co.real_logic.agrona.IoUtil; -import uk.co.real_logic.agrona.concurrent.UnsafeBuffer; +import org.agrona.BitUtil; +import org.agrona.IoUtil; +import org.agrona.concurrent.UnsafeBuffer; /** * Class responsible for storing/writing information in the appropriate the MMF format. diff --git a/management/src/main/java/org/kaazing/gateway/management/monitoring/entity/impl/AgronaLongMonitoringCounter.java b/management/src/main/java/org/kaazing/gateway/management/monitoring/entity/impl/AgronaLongMonitoringCounter.java index 4ba9a283e4..f57e7c73cb 100644 --- a/management/src/main/java/org/kaazing/gateway/management/monitoring/entity/impl/AgronaLongMonitoringCounter.java +++ b/management/src/main/java/org/kaazing/gateway/management/monitoring/entity/impl/AgronaLongMonitoringCounter.java @@ -17,7 +17,7 @@ import org.kaazing.gateway.service.LongMonitoringCounter; -import uk.co.real_logic.agrona.concurrent.AtomicCounter; +import org.agrona.concurrent.status.AtomicCounter; /** * Agrona specific monitoring counter which uses AtomicCounter as the underlying implementation. diff --git a/management/src/main/java/org/kaazing/gateway/management/monitoring/entity/impl/AgronaMonitoringEntityFactory.java b/management/src/main/java/org/kaazing/gateway/management/monitoring/entity/impl/AgronaMonitoringEntityFactory.java index 4b11deb926..7f7fc1bbfb 100644 --- a/management/src/main/java/org/kaazing/gateway/management/monitoring/entity/impl/AgronaMonitoringEntityFactory.java +++ b/management/src/main/java/org/kaazing/gateway/management/monitoring/entity/impl/AgronaMonitoringEntityFactory.java @@ -21,8 +21,8 @@ import org.kaazing.gateway.service.LongMonitoringCounter; import org.kaazing.gateway.service.MonitoringEntityFactory; -import uk.co.real_logic.agrona.concurrent.AtomicCounter; -import uk.co.real_logic.agrona.concurrent.CountersManager; +import org.agrona.concurrent.status.AtomicCounter; +import org.agrona.concurrent.status.CountersManager; /** * MonitoringEntityFactory which provides Agrona specific monitoring entities diff --git a/management/src/main/java/org/kaazing/gateway/management/monitoring/writer/impl/MMFGatewayWriter.java b/management/src/main/java/org/kaazing/gateway/management/monitoring/writer/impl/MMFGatewayWriter.java index 33e24acd3e..32d0c081bb 100644 --- a/management/src/main/java/org/kaazing/gateway/management/monitoring/writer/impl/MMFGatewayWriter.java +++ b/management/src/main/java/org/kaazing/gateway/management/monitoring/writer/impl/MMFGatewayWriter.java @@ -20,8 +20,8 @@ import org.kaazing.gateway.management.monitoring.writer.GatewayWriter; import org.kaazing.gateway.service.MonitoringEntityFactory; -import uk.co.real_logic.agrona.concurrent.CountersManager; -import uk.co.real_logic.agrona.concurrent.UnsafeBuffer; +import org.agrona.concurrent.status.CountersManager; +import org.agrona.concurrent.UnsafeBuffer; public class MMFGatewayWriter implements GatewayWriter { diff --git a/management/src/main/java/org/kaazing/gateway/management/monitoring/writer/impl/MMFServiceWriter.java b/management/src/main/java/org/kaazing/gateway/management/monitoring/writer/impl/MMFServiceWriter.java index cbdd704c9e..4d3fe2d186 100644 --- a/management/src/main/java/org/kaazing/gateway/management/monitoring/writer/impl/MMFServiceWriter.java +++ b/management/src/main/java/org/kaazing/gateway/management/monitoring/writer/impl/MMFServiceWriter.java @@ -20,8 +20,8 @@ import org.kaazing.gateway.management.monitoring.writer.ServiceWriter; import org.kaazing.gateway.service.MonitoringEntityFactory; -import uk.co.real_logic.agrona.concurrent.CountersManager; -import uk.co.real_logic.agrona.concurrent.UnsafeBuffer; +import org.agrona.concurrent.status.CountersManager; +import org.agrona.concurrent.UnsafeBuffer; public class MMFServiceWriter implements ServiceWriter { diff --git a/management/src/test/java/org/kaazing/gateway/management/monitoring/configuration/impl/MonitorFileWriterImplTest.java b/management/src/test/java/org/kaazing/gateway/management/monitoring/configuration/impl/MonitorFileWriterImplTest.java index ed5fcea3cd..fd9112b40b 100644 --- a/management/src/test/java/org/kaazing/gateway/management/monitoring/configuration/impl/MonitorFileWriterImplTest.java +++ b/management/src/test/java/org/kaazing/gateway/management/monitoring/configuration/impl/MonitorFileWriterImplTest.java @@ -27,7 +27,7 @@ import org.kaazing.gateway.management.monitoring.service.MonitoredService; import org.kaazing.gateway.service.MonitoringEntityFactory; -import uk.co.real_logic.agrona.IoUtil; +import org.agrona.IoUtil; @Ignore("doesn't work with latest Agrona 0.4.12") public class MonitorFileWriterImplTest { diff --git a/management/src/test/java/org/kaazing/gateway/management/monitoring/entity/impl/AgronaMonitoringEntityFactoryTest.java b/management/src/test/java/org/kaazing/gateway/management/monitoring/entity/impl/AgronaMonitoringEntityFactoryTest.java index c31a5768ed..048db5527c 100644 --- a/management/src/test/java/org/kaazing/gateway/management/monitoring/entity/impl/AgronaMonitoringEntityFactoryTest.java +++ b/management/src/test/java/org/kaazing/gateway/management/monitoring/entity/impl/AgronaMonitoringEntityFactoryTest.java @@ -27,7 +27,7 @@ import org.kaazing.gateway.service.LongMonitoringCounter; import org.kaazing.gateway.service.MonitoringEntityFactory; -import uk.co.real_logic.agrona.IoUtil; +import org.agrona.IoUtil; @Ignore("doesn't work with latest Agrona 0.4.12") public class AgronaMonitoringEntityFactoryTest { diff --git a/mina.netty/pom.xml b/mina.netty/pom.xml index d167b3625c..cc49109daa 100644 --- a/mina.netty/pom.xml +++ b/mina.netty/pom.xml @@ -71,7 +71,7 @@ provided - uk.co.real-logic + org.agrona Agrona @@ -213,7 +213,7 @@ - uk.co.real-logic:Agrona + org.agrona:Agrona diff --git a/mina.netty/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioSelector.java b/mina.netty/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioSelector.java index d6f2531249..2c0f14bdad 100644 --- a/mina.netty/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioSelector.java +++ b/mina.netty/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioSelector.java @@ -61,8 +61,8 @@ import org.jboss.netty.util.internal.DeadLockProofWorker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import uk.co.real_logic.agrona.concurrent.BackoffIdleStrategy; -import uk.co.real_logic.agrona.concurrent.IdleStrategy; +import org.agrona.concurrent.BackoffIdleStrategy; +import org.agrona.concurrent.IdleStrategy; abstract class AbstractNioSelector implements NioSelector { protected static final Logger PERF_LOGGER = LoggerFactory.getLogger("performance.tcp"); diff --git a/mina.netty/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioWorker.java b/mina.netty/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioWorker.java index 3ad31eba7b..cdc7133076 100644 --- a/mina.netty/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioWorker.java +++ b/mina.netty/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioWorker.java @@ -44,7 +44,7 @@ import org.jboss.netty.util.ThreadNameDeterminer; import org.jboss.netty.util.ThreadRenamingRunnable; import org.kaazing.mina.netty.channel.DefaultWriteCompletionEventEx; -import uk.co.real_logic.agrona.concurrent.OneToOneConcurrentArrayQueue; +import org.agrona.concurrent.OneToOneConcurrentArrayQueue; import java.io.IOException; import java.nio.channels.AsynchronousCloseException; diff --git a/pom.xml b/pom.xml index d8177fe69b..6551054feb 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 1.1 2.6.0 1.7.21 - 0.4.12 + 0.9.0 true -Xmx1024m @@ -189,7 +189,7 @@ ${jdom.version} - uk.co.real-logic + org.agrona Agrona ${agrona.version} From b3dae67cbcee4db4695b4382068b141b9bdf4249 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Mon, 19 Dec 2016 17:33:20 +0200 Subject: [PATCH 09/53] Added enforcer plugin to check if the Notice file is up to date --- distribution/pom.xml | 32 ++++++++++++++++++++++++ distribution/src/main/gateway/NOTICE.txt | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 6873c9db60..bdf9099d60 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -251,6 +251,7 @@ org/kaazing/community/notice/third-party-template.ftl true src/license/THIRD-PARTY.properties + true @@ -261,6 +262,37 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 1.4.1 + + + org.kaazing + community.enforcer + develop-SNAPSHOT + + + + + default-enforce + + false + + + src/main/gateway/NOTICE.txt + target/NOTICE.txt + + + + + + enforce + + verify + + + org.apache.maven.plugins maven-assembly-plugin diff --git a/distribution/src/main/gateway/NOTICE.txt b/distribution/src/main/gateway/NOTICE.txt index 67a75dc3f0..48d0b8604a 100644 --- a/distribution/src/main/gateway/NOTICE.txt +++ b/distribution/src/main/gateway/NOTICE.txt @@ -61,7 +61,7 @@ This product depends on Apache Log4j 1.2.17 This product depends on Java Native Access 3.3.0 License: http://www.gnu.org/licenses/licenses.html (LGPL) - Homepage: Home page is not included in maven artifact, and thus couldn't be referenced here + The project URL is not included in this dependency's pom, and thus could not be referenced here. This product depends on opencsv 2.3 From f468d129b0aa3fdc6477f031d51180695eaaa645 Mon Sep 17 00:00:00 2001 From: apirvu Date: Mon, 19 Dec 2016 17:38:36 +0200 Subject: [PATCH 10/53] Only http or only tcp in auth scripts --- .../http/proxy/HttpProxyAuthenticationIT.java | 8 +- .../http.proxy.auth.authentication.basic.rpt | 121 +++++++----------- ...tp.proxy.auth.authentication.basic.tcp.rpt | 118 +++++++++++++++++ .../http.proxy.auth.authentication.digest.rpt | 15 ++- 4 files changed, 178 insertions(+), 84 deletions(-) create mode 100644 service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.tcp.rpt diff --git a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java index b07785ffd8..0e8551407d 100644 --- a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java +++ b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java @@ -122,9 +122,15 @@ public void authenticationDigest() throws Exception { robot.finish(); } + @Test + @Specification("auth/http.proxy.auth.authentication.basic.tcp") + public void authenticationBasicTcp() throws Exception { + robot.finish(); + } + @Test @Specification("auth/http.proxy.auth.authentication.basic") - public void authenticationBasic() throws Exception { + public void authenticationBasicHttp() throws Exception { robot.finish(); } diff --git a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt index fe5ddf2478..904cb1af7d 100644 --- a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt +++ b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt @@ -21,37 +21,25 @@ connect http://localhost:8110/hello connected -write "GET /basic-auth/user/passwd HTTP/1.1\r\n" -write "Host: localhost:8110\r\n" -write "Connection: keep-alive\r\n" -write "Upgrade-Insecure-Requests: 1\r\n" -write "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" -write "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8\r\n" -write "DNT: 1\r\n" -write "Accept-Encoding: gzip, deflate, sdch\r\n" -write "Accept-Language: en-US,en;q=0.8\r\n" -write "\r\n" - -read "HTTP/1.1 401 UNAUTHORIZED\r\n" -read "Access-Control-Allow-Credentials: true\r\n" -read "Access-Control-Allow-Origin: *\r\n" -read "Content-Length: 0\r\n" -read "Content-Type: text/html\r\n" -read "Date: Mon, 04 Jul 2016 14:46:44 GMT\r\n" -read "Server: nginx\r\n" -read "WWW-Authenticate: Basic realm=\"Fake Realm\"\r\n" -read "\r\n" - -write "GET /basic-auth/user/passwd HTTP/1.1\r\n" -write "Host: localhost:8110\r\n" -write "Connection: keep-alive\r\n" -write "Authorization: Basic bmFtZUF1dGg6UGFzc0F1dGg=\r\n" -write "Upgrade-Insecure-Requests: 1\r\n" -write "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" -write "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8\r\n" -write "Accept-Encoding: gzip, deflate, sdch\r\n" -write "Accept-Language: en-US,en;q=0.8\r\n" -write "\r\n" +write method "GET" +write parameter "/basic-auth/user/passwd" +write version "HTTP/1.1" +write header "User-Agent" "curl/7.37.1" +write header "Host" "localhost:8110" +write header "Accept" "*/*" + + +read status "401" "UNAUTHORIZED" +read version "HTTP/1.1" + + + +write method "GET" +write parameter "/basic-auth/user/passwd" +write parameter "HTTP/1.1" +write header "User-Agent" "curl/7.37.1" +write header "Host" "localhost:8110" +write header "Accept" "*/*" read status "200" "OK" @@ -62,55 +50,34 @@ closed # server # + + accept http://localhost:8080/hello accepted connected -read "GET /basic-auth/user/passwd HTTP/1.1\r\n" -read /Via: 1.1 kaazing-.+/ "\r\n" -read "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" -read "Upgrade-Insecure-Requests: 1\r\n" -read "Host: localhost:8080\r\n" -read "DNT: 1\r\n" -read "Accept-Language: en-US\r\n" -read "Accept-Language: en;q=0.8\r\n" -read "Accept-Encoding: gzip\r\n" -read "Accept-Encoding: deflate\r\n" -read "Accept-Encoding: sdch\r\n" -read "Accept: text/html\r\n" -read "Accept: application/xhtml+xml\r\n" -read "Accept: application/xml;q=0.9\r\n" -read "Accept: image/webp\r\n" -read "Accept: */*;q=0.8\r\n" -read "\r\n" - -write "HTTP/1.1 401 UNAUTHORIZED\r\n" -write "Access-Control-Allow-Credentials: true\r\n" -write "Access-Control-Allow-Origin: *\r\n" -write "Content-Length: 0\r\n" -write "Content-Type: text/html\r\n" -write "Date: Mon, 04 Jul 2016 14:46:44 GMT\r\n" -write "Server: nginx\r\n" -write "WWW-Authenticate: Basic realm=\"Fake Realm\"\r\n" -write "\r\n" - -read "GET /basic-auth/user/passwd HTTP/1.1\r\n" -read /Via: 1.1 kaazing-.+/ "\r\n" -read "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" -read "Upgrade-Insecure-Requests: 1\r\n" -read "Host: localhost:8080\r\n" -read "Authorization: Basic bmFtZUF1dGg6UGFzc0F1dGg=\r\n" -read "Accept-Language: en-US\r\n" -read "Accept-Language: en;q=0.8\r\n" -read "Accept-Encoding: gzip\r\n" -read "Accept-Encoding: deflate\r\n" -read "Accept-Encoding: sdch\r\n" -read "Accept: text/html\r\n" -read "Accept: application/xhtml+xml\r\n" -read "Accept: application/xml;q=0.9\r\n" -read "Accept: image/webp\r\n" -read "Accept: */*;q=0.8\r\n" -read "\r\n" + + +read method "GET" +write parameter "/basic-auth/user/passwd" +write version "HTTP/1.1" +read header "Via" "1.1 kaazing" +read header "User-Agent" "curl/7.37.1" +read header "Host" "localhost:8080" +read header "Accept" "*/*" +read closed + +write status "401" "UNAUTHORIZED" +write version "HTTP/1.1" + +read method "GET" +write parameter "/basic-auth/user/passwd" +write parameter "HTTP/1.1" +read header "Via" "1.1 kaazing" +read header "User-Agent" "curl/7.37.1" +read header "Host" "localhost:8080" +read header "Accept" "*/*" +read closed write status "200" "OK" -write close \ No newline at end of file +write close diff --git a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.tcp.rpt b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.tcp.rpt new file mode 100644 index 0000000000..aace812330 --- /dev/null +++ b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.tcp.rpt @@ -0,0 +1,118 @@ +# +# Copyright 2007-2016, Kaazing Corporation. 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. +# + +# +# client +# + +connect tcp://localhost:8110 +connected + +write "GET /basic-auth/user/passwd HTTP/1.1\r\n" +write "Host: localhost:8110\r\n" +write "Connection: keep-alive\r\n" +write "Upgrade-Insecure-Requests: 1\r\n" +write "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" +write "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8\r\n" +write "DNT: 1\r\n" +write "Accept-Encoding: gzip, deflate, sdch\r\n" +write "Accept-Language: en-US,en;q=0.8\r\n" +write "\r\n" + +read "HTTP/1.1 401 UNAUTHORIZED\r\n" +read "Access-Control-Allow-Credentials: true\r\n" +read "Access-Control-Allow-Origin: *\r\n" +read "Content-Length: 0\r\n" +read "Content-Type: text/html\r\n" +read "Date: Mon, 04 Jul 2016 14:46:44 GMT\r\n" +read "Server: nginx\r\n" +read "WWW-Authenticate: Basic realm=\"Fake Realm\"\r\n" +read "\r\n" + +write "GET /basic-auth/user/passwd HTTP/1.1\r\n" +write "Host: localhost:8110\r\n" +write "Connection: keep-alive\r\n" +write "Authorization: Basic bmFtZUF1dGg6UGFzc0F1dGg=\r\n" +write "Upgrade-Insecure-Requests: 1\r\n" +write "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" +write "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8\r\n" +write "Accept-Encoding: gzip, deflate, sdch\r\n" +write "Accept-Language: en-US,en;q=0.8\r\n" +write "\r\n" + +read "HTTP/1.1 200 OK\r\n" + +close +closed + +# +# server +# + +accept tcp://localhost:8080 +accepted +connected + +read "GET /basic-auth/user/passwd HTTP/1.1\r\n" +read /Via: 1.1 kaazing-.+/ "\r\n" +read "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" +read "Upgrade-Insecure-Requests: 1\r\n" +read "Host: localhost:8080\r\n" +read "DNT: 1\r\n" +read "Accept-Language: en-US\r\n" +read "Accept-Language: en;q=0.8\r\n" +read "Accept-Encoding: gzip\r\n" +read "Accept-Encoding: deflate\r\n" +read "Accept-Encoding: sdch\r\n" +read "Accept: text/html\r\n" +read "Accept: application/xhtml+xml\r\n" +read "Accept: application/xml;q=0.9\r\n" +read "Accept: image/webp\r\n" +read "Accept: */*;q=0.8\r\n" +read "\r\n" + +write "HTTP/1.1 401 UNAUTHORIZED\r\n" +write "Access-Control-Allow-Credentials: true\r\n" +write "Access-Control-Allow-Origin: *\r\n" +write "Content-Length: 0\r\n" +write "Content-Type: text/html\r\n" +write "Date: Mon, 04 Jul 2016 14:46:44 GMT\r\n" +write "Server: nginx\r\n" +write "WWW-Authenticate: Basic realm=\"Fake Realm\"\r\n" +write "\r\n" + +read "GET /basic-auth/user/passwd HTTP/1.1\r\n" +read /Via: 1.1 kaazing-.+/ "\r\n" +read "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" +read "Upgrade-Insecure-Requests: 1\r\n" +read "Host: localhost:8080\r\n" +read "Authorization: Basic bmFtZUF1dGg6UGFzc0F1dGg=\r\n" +read "Accept-Language: en-US\r\n" +read "Accept-Language: en;q=0.8\r\n" +read "Accept-Encoding: gzip\r\n" +read "Accept-Encoding: deflate\r\n" +read "Accept-Encoding: sdch\r\n" +read "Accept: text/html\r\n" +read "Accept: application/xhtml+xml\r\n" +read "Accept: application/xml;q=0.9\r\n" +read "Accept: image/webp\r\n" +read "Accept: */*;q=0.8\r\n" +read "\r\n" + +write "HTTP/1.1 200 OK\r\n" + +close +closed \ No newline at end of file diff --git a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt index ef2acb97c4..761d9afa86 100644 --- a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt +++ b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt @@ -18,7 +18,7 @@ # client # -connect http://localhost:8110/hello +connect tcp://localhost:8110 connected write "GET /digest-auth/auth/user/passwd HTTP/1.1\r\n" @@ -57,7 +57,7 @@ write "Accept-Language: en-US,en;q=0.8\r\n" write "Cookie: fake=fake_value\r\n" write "\r\n" -read status "200" "OK" +read "HTTP/1.1 200 OK\r\n" close closed @@ -66,7 +66,7 @@ closed # server # -accept http://localhost:8080/hello +accept tcp://localhost:8080 accepted connected @@ -117,8 +117,11 @@ read "Accept: text/html\r\n" read "Accept: application/xhtml+xml\r\n" read "Accept: application/xml;q=0.9\r\n" read "Accept: image/webp\r\n" -read "Accept: */*;q=0.8\r\n" +read "Accept: */*;q=0.8\r\n"git read "\r\n" -write status "200" "OK" -write close +write "HTTP/1.1 200 OK\r\n" + +close +closed + From 9e89af6a79e3ed2d0f904368dd42b432dc261c36 Mon Sep 17 00:00:00 2001 From: apirvu Date: Tue, 20 Dec 2016 14:55:08 +0200 Subject: [PATCH 11/53] minor changes to avoid Exception --- .../http/proxy/auth/http.proxy.auth.authentication.digest.rpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt index 761d9afa86..7e2fc437cd 100644 --- a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt +++ b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt @@ -117,7 +117,7 @@ read "Accept: text/html\r\n" read "Accept: application/xhtml+xml\r\n" read "Accept: application/xml;q=0.9\r\n" read "Accept: image/webp\r\n" -read "Accept: */*;q=0.8\r\n"git +read "Accept: */*;q=0.8\r\n" read "\r\n" write "HTTP/1.1 200 OK\r\n" From d13d69533db988924e97c8baadfb8521311fd506 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Thu, 22 Dec 2016 16:18:15 +0200 Subject: [PATCH 12/53] Updated top level Notice.txt file Implemented changes after feedback --- NOTICE.txt | 731 ++++++++++++++++++----- distribution/pom.xml | 14 +- distribution/src/main/gateway/NOTICE.txt | 2 +- mina.netty/pom.xml | 2 +- pom.xml | 43 +- 5 files changed, 635 insertions(+), 157 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index f0ce162638..e6b837b2cd 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,314 +1,765 @@ +This product depends on Ant 1.6 + + License: Unknown license + The project URL is not included in this dependency's pom, and thus could not be referenced here. + +This product depends on ASM Core 3.1 + + License: Unknown license + Homepage: http://asm.objectweb.org/asm/ + +This product depends on ASM Commons 3.1 + + License: Unknown license + Homepage: http://asm.objectweb.org/asm-commons/ + +This product depends on ASM Tree 3.1 + + License: Unknown license + Homepage: http://asm.objectweb.org/asm-tree/ + +This product depends on ASM Util 3.1 + + License: Unknown license + Homepage: http://asm.objectweb.org/asm-util/ + +This product depends on cglib 2.1_3 + + License: Unknown license + Homepage: http://cglib.sourceforge.net/ + +This product depends on classworlds 1.1-alpha-2 + + License: Unknown license + Homepage: http://classworlds.codehaus.org/ + +This product depends on RMock 2.0.0 + + License: ${basedir}/../tools/licenses/LICENSE.txt (RMock License) + Homepage: http://rmock.sourceforge.net + +This product depends on FindBugs-jsr305 2.0.1 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://findbugs.sourceforge.net/ + +This product depends on hazelcast 1.9.4.8 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://www.hazelcast.com/hazelcast/ + +This product depends on hazelcast-client 1.9.4.8 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://www.hazelcast.com/hazelcast-client/ + +This product depends on hazelcast-cloud 1.9.4.8 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://www.hazelcast.com/hazelcast-cloud/ + +This product depends on icu4j 2.6.1 + + License: Unknown license + The project URL is not included in this dependency's pom, and thus could not be referenced here. + This product depends on Commons CLI 1.2 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://commons.apache.org/cli/ -This product depends on Kaazing Gateway Distribution Version Provider 5.0 +This product depends on Commons IO 2.4 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://commons.apache.org/io/ + +This product depends on Java Unified Expression Language API 2.2.7 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://juel.sourceforge.net/juel-api/ + +This product depends on Java Unified Expression Language Implementation 2.2.7 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://juel.sourceforge.net/juel-impl/ + +This product depends on dom4j 1.6.1 + + License: Unknown license + Homepage: http://dom4j.org + +This product depends on Netty 3.10.5.Final License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.distribution.git/gateway.distribution.version + Homepage: http://netty.io/ + +This product depends on jaxen 1.1.1 + + License: Unknown license + Homepage: http://jaxen.codehaus.org/ + +This product depends on Javassist 3.7.ga + + License: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/jboss/javassist/License.html?rev=HEAD&content-type=text/html (MPL 1.1) + Homepage: http://labs.jboss.com/javassist/ + +This product depends on jdom 1.0 + + License: Unknown license + The project URL is not included in this dependency's pom, and thus could not be referenced here. + +This product depends on JUnit 4.12 + + License: http://www.eclipse.org/legal/epl-v10.html (Eclipse Public License 1.0) + Homepage: http://junit.org + +This product depends on JUnit 4.4 + + License: http://www.opensource.org/licenses/cpl1.0.txt (Common Public License Version 1.0) + Homepage: http://junit.org + +This product depends on JUnit 4.4 + + License: http://www.opensource.org/licenses/cpl1.0.txt (Common Public License Version 1.0) + Homepage: http://junit.org + +This product depends on Apache Log4j 1.2.17 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://logging.apache.org/log4j/1.2/ + +This product depends on Java Native Access 3.3.0 + + License: Unknown license + The project URL is not included in this dependency's pom, and thus could not be referenced here. + +This product depends on JOpt Simple 4.6 + + License: http://www.opensource.org/licenses/mit-license.php (The MIT License) + Homepage: http://pholser.github.com/jopt-simple + +This product depends on opencsv 2.3 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: http://opencsv.sf.net + +This product depends on OGNL - Object Graph Navigation Library 2.7.2 + + License: Unknown license + Homepage: http://ognl.org + +This product depends on abego TreeLayout Core 1.0.1 + + License: http://treelayout.googlecode.com/files/LICENSE.TXT (BSD 3-Clause "New" or "Revised" License (BSD-3-Clause)) + Homepage: http://code.google.com/p/treelayout/ + +This product depends on ANTLR 4 Runtime Annotations 4.2.2 + + License: http://www.antlr.org/license.html (The BSD License) + Homepage: http://www.antlr.org/antlr4-annotations + +This product depends on ANTLR 4 Runtime 4.2.2 + + License: http://www.antlr.org/license.html (The BSD License) + Homepage: http://www.antlr.org/antlr4-runtime + +This product depends on Commons Lang 3.1 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://commons.apache.org/lang/ + +This product depends on Commons Math 3.2 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://commons.apache.org/proper/commons-math/ + +This product depends on Maven Artifact 2.0.7 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://maven.apache.org/maven-artifact + +This product depends on Maven Artifact Manager 2.0.7 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://maven.apache.org/maven-artifact-manager + +This product depends on Maven Model 2.0.7 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://maven.apache.org/maven-model + +This product depends on Maven Plugin API 2.0.7 -This product depends on Kaazing WebSocket Gateway - Management 5.0 + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://maven.apache.org/maven-plugin-api + +This product depends on Maven Plugin Registry Model 2.0.7 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://maven.apache.org/maven-plugin-registry + +This product depends on Maven Profile Model 2.0.7 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://maven.apache.org/maven-profile + +This product depends on Maven Project Builder 2.0.7 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://maven.apache.org/maven-project + +This product depends on Maven Repository Metadata Model 2.0.7 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://maven.apache.org/maven-repository-metadata + +This product depends on Maven Local Settings Model 2.0.7 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://maven.apache.org/maven-settings + +This product depends on Maven Shade Plugin 1.1 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://maven.apache.org/plugins/maven-shade-plugin/ + +This product depends on Maven Dependency Tree 1.1 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://maven.apache.org/shared/maven-dependency-tree/ + +This product depends on Apache Maven Shared Utils 3.0.0 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache License, Version 2.0) + Homepage: http://maven.apache.org/shared/maven-shared-utils/ + +This product depends on Maven Wagon API 1.0-beta-2 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://maven.apache.org/wagon/wagon-provider-api + +This product depends on XmlBeans 2.4.0 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://xmlbeans.apache.org + +This product depends on BeanShell 2.0b4 + + License: http://www.gnu.org/licenses/lgpl.txt (GNU LESSER GENERAL PUBLIC LICENSE) + The project URL is not included in this dependency's pom, and thus could not be referenced here. + +This product depends on Default Plexus Container 1.0-alpha-9-stable-1 + + License: Unknown license + The project URL is not included in this dependency's pom, and thus could not be referenced here. + +This product depends on Plexus Common Utilities 1.4.4 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: http://plexus.codehaus.org/plexus-utils + +This product depends on EasyMock 2.3 + + License: http://www.easymock.org/License.html (MIT License) + Homepage: http://www.easymock.org + +This product depends on EasyMock class extension 2.3 + + License: http://www.easymock.org/License.html (MIT License) + Homepage: http://www.easymock.org + +This product depends on Hamcrest Core 1.3 + + License: http://www.opensource.org/licenses/bsd-license.php (New BSD License) + Homepage: https://github.com/hamcrest/JavaHamcrest/hamcrest-core + +This product depends on Hamcrest library 1.3 + + License: http://www.opensource.org/licenses/bsd-license.php (New BSD License) + Homepage: https://github.com/hamcrest/JavaHamcrest/hamcrest-library - License is not included in maven artifact, look at homepage for license +This product depends on JDOM 1.1 + + License: Unknown license + Homepage: http://www.jdom.org/ + +This product depends on jMock 2 Core 2.6.0 + + License: http://jmock.org/license.html (BSD style) + Homepage: http://nexus.sonatype.org/oss-repository-hosting.html/jmock-parent/jmock + +This product depends on jMock JUnit 4 Extension 2.6.0 + + License: http://jmock.org/license.html (BSD style) + Homepage: http://nexus.sonatype.org/oss-repository-hosting.html/jmock-parent/jmock-junit4 + +This product depends on jMock Legacy Extension 2.6.0 + + License: http://jmock.org/license.html (BSD style) + Homepage: http://nexus.sonatype.org/oss-repository-hosting.html/jmock-parent/jmock-legacy + +This product depends on jMock Script Extension 2.6.0 + + License: http://jmock.org/license.html (BSD style) + Homepage: http://nexus.sonatype.org/oss-repository-hosting.html/jmock-parent/jmock-script + +This product depends on JSON (JavaScript Object Notation) 20090211 + + License: http://www.json.org/license.html (provided without support or warranty) + Homepage: http://www.json.org/java/index.html + +This product depends on Kaazing Corporation License 2.17 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/community + +This product depends on Kaazing Corporation License 2.18 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/community + +This product depends on Kaazing Gateway Bridge develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway/bridge/gateway.bridge + +This product depends on Kaazing WebSocket Gateway - Java Client Bridge 5.0.0.5 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.client.java.bridge + +This product depends on Kaazing WebSocket Gateway - Java Client Transport 5.0.0.6 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.client.java.transport.git + +This product depends on Kaazing Gateway Client Javascript Bridge Packaging develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway/bridge/gateway.client.javascript.bridge + +This product depends on Kaazing WebSocket Gateway - Management develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.management.git -This product depends on Http Resource Address 1.0 +This product depends on Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.resource.address.git + +This product depends on Http Resource Address develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.http.git -This product depends on Httpx Resource Address 1.0 +This product depends on Httpx Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.httpx.git -This product depends on Httpxdraft Resource Address 1.0 +This product depends on Httpxdraft Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.httpxdraft.git -This product depends on Httpxe Resource Address 1.0 +This product depends on Httpxe Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.httpxe.git -This product depends on Pipe Resource Address 1.0 +This product depends on Pipe Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.pipe.git -This product depends on Rtmp Resource Address 1.0 +This product depends on Rtmp Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.rtmp.git -This product depends on Sse Resource Address 1.0 +This product depends on Sse Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.sse.git -This product depends on Ssl Resource Address 1.0 +This product depends on Ssl Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.ssl.git -This product depends on Tcp Resource Address 1.0 +This product depends on Tcp Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.tcp.git -This product depends on Udp Resource Address 1.0 +This product depends on Udp Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.udp.git -This product depends on Ws Resource Address 1.0 +This product depends on Ws Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.ws.git -This product depends on Wsdraft Resource Address 1.0 +This product depends on Wsdraft Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.wsdraft.git -This product depends on Wse Resource Address 1.0 +This product depends on Wse Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.wse.git -This product depends on Wsn Resource Address 1.0 +This product depends on Wsn Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.wsn.git -This product depends on Wsx Resource Address 1.0 +This product depends on Wsx Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.wsx.git -This product depends on Wsxdraft Resource Address 1.0 +This product depends on Wsxdraft Resource Address develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.resource.address.wsxdraft.git -This product depends on Resource Address 1.0 +This product depends on Gateway Security develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.git + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.security.git -This product depends on Gateway Security 1.0 +This product depends on Kaazing WebSocket Gateway - Server develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.security.git + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.server.git -This product depends on Kaazing WebSocket Gateway - Server API 5.0 +This product depends on Kaazing WebSocket Gateway - Server API develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.server.api.git -This product depends on Kaazing WebSocket Gateway - Server Service Provider Interface 5.0 +This product depends on Kaazing WebSocket Gateway - Server Service Provider Interface develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.server.spi.git -This product depends on Kaazing WebSocket Gateway - Server 5.0 +This product depends on Gateway Service develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.server.git + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.service.git -This product depends on Kaazing WebSocket Gateway - AMQP Service 5.0 +This product depends on Kaazing WebSocket Gateway - AMQP Service develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/amqp.server.git -This product depends on Broadcast Service 1.0 +This product depends on Broadcast Service develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.service.broadcast.git -This product depends on Echo Service 1.0 +This product depends on Echo Service develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.service.echo.git -This product depends on Http Balancer Service 1.0 +This product depends on Http Balancer Service develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.service.http.balancer.git -This product depends on Http Directory Service 1.0 +This product depends on Http Directory Service develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.service.http.directory.git -This product depends on Proxy Service 1.0 +This product depends on Http Proxy Service develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway/service/gateway.service.http.proxy + +This product depends on Proxy Service develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.service.proxy.git -This product depends on gateway.service.update.check.management 1.0 +This product depends on TURN REST Service develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.update.check.management.git + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.service.turn.rest.git -This product depends on Update Check Service 1.0 +This product depends on Update Check Service develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.service.update.check.git -This product depends on Gateway Service 1.0 +This product depends on Update Check Management Service develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.git + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.service.update.check.management.git -This product depends on BIO Transport 1.0 +This product depends on Keystore and Truststore used for testing TLS 1.0.0.24 - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.test.ca.git + +This product depends on Transport Core develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.transport.git + +This product depends on BIO Transport develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.transport.bio.git -This product depends on Http Transport 1.0 +This product depends on Http Transport develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.transport.http.git -This product depends on NIO Transport 1.0 +This product depends on NIO Transport develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.transport.nio.git -This product depends on Pipe Transport 1.0 +This product depends on Pipe Transport develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.transport.pipe.git -This product depends on Sse Transport 1.0 +This product depends on Sse Transport develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.transport.sse.git -This product depends on SSL Transport 1.0 +This product depends on SSL Transport develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.transport.ssl.git -This product depends on WS Transport 1.0 +This product depends on WS Transport develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.transport.ws.git -This product depends on WSEB Transport 1.0 +This product depends on WSEB Transport develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.transport.wseb.git -This product depends on WSN Transport 1.0 +This product depends on WSN Transport develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.transport.wsn.git -This product depends on wsr Transport 1.0 +This product depends on Kaazing WebSocket Gateway - Truststore 1.0.0.81 - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.wsr.git + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.truststore.git -This product depends on Transport Core 1.0 +This product depends on Gateway Utils develop-SNAPSHOT - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.git + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/gateway.util.git -This product depends on Kaazing WebSocket Gateway - Truststore 1.0 +This product depends on k3po/junit 3.0.0-alpha-55 - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.truststore.git + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/k3po -This product depends on Gateway Utils 1.0 +This product depends on k3po/lang 3.0.0-alpha-55 - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.util.git + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/k3po + +This product depends on Apache MINA Core develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) + Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-core + +This product depends on Apache MINA JavaBeans Integration develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) + Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-beans + +This product depends on Apache MINA JMX Integration develop-SNAPSHOT -This product depends on hazelcast-client 1.9 + License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) + Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-jmx + +This product depends on Apache MINA OGNL Integration develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) + Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-ognl + +This product depends on Kaazing's Modified Mina Netty Adapter develop-SNAPSHOT License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://www.hazelcast.com/hazelcast-client/ + Homepage: https://github.com/kaazing/mina.netty.git -This product depends on hazelcast-cloud 1.9 +This product depends on Net API 1.1.0.9 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://www.hazelcast.com/hazelcast-cloud/ + Homepage: https://github.com/kaazing/net.api/net.api -This product depends on hazelcast 1.9 +This product depends on Net TCP Implementation 1.1.0.9 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://www.hazelcast.com/hazelcast/ + Homepage: https://github.com/kaazing/net.api/net.tcp -This product depends on JDOM 1.1 +This product depends on Net Extensions Common 0.4.0 - License: https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt (JDOM License) - Homepage: http://www.jdom.org/ + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/netx + +This product depends on Net Data Implementation 0.4.0 -This product depends on Java Native Access 3.3 + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/netx - License: http://www.gnu.org/licenses/licenses.html (LGPL) - Homepage: https://github.com/twall/jna +This product depends on SNMP4J 1.11.3 -This product depends on JSON (JavaScript Object Notation) 20090211 + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: https://github.com/kaazing/snmp4j - License: http://www.json.org/license.html (provided without support or warranty) - Homepage: http://www.json.org/java/index.html +This product depends on SNMP4J-Agent 1.4.3 -This product depends on Apache Log4j 1.2 + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: https://github.com/kaazing/snmp4j.agent + +This product depends on AMQP Protocol Specification 3.0.0-alpha-55 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://logging.apache.org/log4j/1.2/ + Homepage: https://github.com/k3po/k3po/tree/develop/specification/specification.amqp.0.9.1 -This product depends on Mina Netty Adapter 1.5 +This product depends on HTTP Protocol Specification 3.0.0-alpha-55 - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) - Homepage: https://github.com/kaazing/mina.netty.git + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/k3po/specification.http + +This product depends on HTTPX Protocol Specification 3.0.0-alpha-55 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/k3po/k3po.git + +This product depends on HTTP Extension and Emulation Protocol Specification 3.0.0-alpha-55 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/specification.httpxe -This product depends on SLF4J API Module 1.7 +This product depends on TCP Protocol Specification 3.0.0-alpha-55 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/k3po/specification.tcp + +This product depends on UDP Protocol Specification 3.0.0-alpha-55 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/k3po/specification.udp + +This product depends on Websocket Protocol (RFC-6455) Specification 3.0.0-alpha-55 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/specification.ws + +This product depends on WebSocket Emulation Protocol Specification 3.0.0-alpha-55 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/specification.wse + +This product depends on WebSocket x-kaazing-idle-timeout Specification 3.0.0-alpha-55 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/specification.x-kaazing-idle-timeout + +This product depends on WebSocket Extension: x-kaazing-ping-pong Specification 3.0.0-alpha-55 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/k3po/k3po.git + +This product depends on Test Utils develop-SNAPSHOT + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) + Homepage: https://github.com/kaazing/test.util.git + +This product depends on Objenesis 1.0 + + License: http://objenesis.googlecode.com/svn/docs/license.html (MIT License) + Homepage: http://objenesis.googlecode.com/svn/docs/index.html + +This product depends on JMH Core 1.14 + + License: http://openjdk.java.net/legal/gplv2+ce.html (GNU General Public License (GPL), version 2, with the Classpath exception) + Homepage: http://openjdk.java.net/projects/code-tools/jmh/jmh-core/ + +This product depends on JMH Generators: Annotation Processors 1.14 + + License: http://openjdk.java.net/legal/gplv2+ce.html (GNU General Public License (GPL), version 2, with the Classpath exception) + Homepage: http://openjdk.java.net/projects/code-tools/jmh/jmh-generator-annprocess/ + +This product depends on JCL 1.1.1 implemented over SLF4J 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) Homepage: http://www.slf4j.org -This product depends on SLF4J LOG4J-12 Binding 1.7 +This product depends on SLF4J API Module 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) Homepage: http://www.slf4j.org -This product depends on SNMP4J-Agent 1.4 +This product depends on SLF4J JDK14 Binding 1.7.21 - License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) - Homepage: http://www.snmp4j.org + License: http://www.opensource.org/licenses/mit-license.php (MIT License) + Homepage: http://www.slf4j.org -This product depends on SNMP4J 1.11 +This product depends on SLF4J LOG4J-12 Binding 1.7.21 - License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) - Homepage: http://www.snmp4j.org + License: http://www.opensource.org/licenses/mit-license.php (MIT License) + Homepage: http://www.slf4j.org + +This product depends on PMD 4.2 -This product depends on StAX API 1.0 + License: Unknown license + Homepage: http://pmd.sourceforge.net/ + +This product depends on StAX API 1.0.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://stax.codehaus.org/ -This product depends on Test Utils 1.0 +This product depends on Agrona 0.4.12 - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) - Homepage: https://github.com/kaazing/test.util.git + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache License, Version 2.0) + Homepage: https://github.com/real-logic/Agrona -This product depends on XmlBeans 2.4 +This product depends on xalan 2.6.0 - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://xmlbeans.apache.org + License: Unknown license + The project URL is not included in this dependency's pom, and thus could not be referenced here. -This product contains a modified version of Apache Mina 2.0.0 RC1 +This product depends on xercesImpl 2.6.2 - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://mina.apache.org/ + License: Unknown license + The project URL is not included in this dependency's pom, and thus could not be referenced here. -This product depends on opencsv 2.3 +This product depends on xmlParserAPIs 2.6.2 + + License: Unknown license + The project URL is not included in this dependency's pom, and thus could not be referenced here. + +This product depends on xml-apis 1.3.02 + + License: Unknown license + Homepage: http://xml.apache.org/commons/#external + +This product depends on xom 1.0 + + License: null (LGPL) + Homepage: http://www.xom.nu - License: http://opencsv.sourceforge.net/license.html (The Apache License, Version 2.0) - Homepage: http://opencsv.sourceforge.net/ diff --git a/distribution/pom.xml b/distribution/pom.xml index bdf9099d60..7e2da6ef8c 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -244,8 +244,9 @@ org.codehaus.mojo license-maven-plugin + ${codehaus.license.version} - target + ${project.build.directory} NOTICE.txt true org/kaazing/community/notice/third-party-template.ftl @@ -265,14 +266,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.4.1 - - - org.kaazing - community.enforcer - develop-SNAPSHOT - - + ${maven.enforcer.version} default-enforce @@ -282,7 +276,7 @@ src/main/gateway/NOTICE.txt target/NOTICE.txt - + diff --git a/distribution/src/main/gateway/NOTICE.txt b/distribution/src/main/gateway/NOTICE.txt index 48d0b8604a..5d174b67dc 100644 --- a/distribution/src/main/gateway/NOTICE.txt +++ b/distribution/src/main/gateway/NOTICE.txt @@ -393,7 +393,7 @@ This product depends on Apache MINA OGNL Integration develop-SNAPSHOT License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-ognl -This product depends on Mina Netty Adapter develop-SNAPSHOT +This product depends on Kaazing's Modified Mina Netty Adapter develop-SNAPSHOT License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/mina.netty.git diff --git a/mina.netty/pom.xml b/mina.netty/pom.xml index d167b3625c..2b0164cc57 100644 --- a/mina.netty/pom.xml +++ b/mina.netty/pom.xml @@ -9,7 +9,7 @@ mina.netty jar - Mina Netty Adapter + Kaazing's Modified Mina Netty Adapter Implementation of mina abstractions using netty https://github.com/kaazing/mina.netty.git diff --git a/pom.xml b/pom.xml index a5d716c445..d0e115a9a1 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,9 @@ -Xmx1024m 2.3 1.14 + 2.24 + 1.10 + 1.4.1 @@ -379,20 +382,18 @@ org.codehaus.mojo license-maven-plugin - 1.10 + ${codehaus.license.version} false - target + ${project.build.directory} NOTICE.txt - true org/kaazing/community/notice/third-party-template.ftl org.kaazing community.notice - jar - develop-SNAPSHOT + ${community.version} @@ -404,6 +405,38 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven.enforcer.version} + false + + + org.kaazing + community.enforcer + ${community.version} + + + + + default-enforce + + false + + + NOTICE.txt + target/NOTICE.txt + + + + + + enforce + + verify + + + From 4af0118c1137bd71e7ee47eaad86b552b9bf43f1 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Thu, 22 Dec 2016 16:48:40 +0200 Subject: [PATCH 13/53] Updated Notice files after syncronizing with upstream Updated error message for the enforcer rule --- NOTICE.txt | 34 ++++++++++++------------ distribution/pom.xml | 2 +- distribution/src/main/gateway/NOTICE.txt | 32 +++++----------------- pom.xml | 2 +- 4 files changed, 25 insertions(+), 45 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index e6b837b2cd..d6edc8e805 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -43,20 +43,20 @@ This product depends on FindBugs-jsr305 2.0.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://findbugs.sourceforge.net/ -This product depends on hazelcast 1.9.4.8 +This product depends on hazelcast 3.7.4 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://www.hazelcast.com/hazelcast/ -This product depends on hazelcast-client 1.9.4.8 +This product depends on hazelcast-aws 1.1.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://www.hazelcast.com/hazelcast-client/ + Homepage: http://www.hazelcast.com/ -This product depends on hazelcast-cloud 1.9.4.8 +This product depends on hazelcast-client 3.7.4 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://www.hazelcast.com/hazelcast-cloud/ + Homepage: http://www.hazelcast.com/hazelcast-client/ This product depends on icu4j 2.6.1 @@ -568,12 +568,12 @@ This product depends on Gateway Utils develop-SNAPSHOT License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.util.git -This product depends on k3po/junit 3.0.0-alpha-55 +This product depends on k3po/junit 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/k3po -This product depends on k3po/lang 3.0.0-alpha-55 +This product depends on k3po/lang 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/k3po @@ -633,52 +633,52 @@ This product depends on SNMP4J-Agent 1.4.3 License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) Homepage: https://github.com/kaazing/snmp4j.agent -This product depends on AMQP Protocol Specification 3.0.0-alpha-55 +This product depends on AMQP Protocol Specification 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/k3po/k3po/tree/develop/specification/specification.amqp.0.9.1 -This product depends on HTTP Protocol Specification 3.0.0-alpha-55 +This product depends on HTTP Protocol Specification 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/k3po/specification.http -This product depends on HTTPX Protocol Specification 3.0.0-alpha-55 +This product depends on HTTPX Protocol Specification 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/k3po/k3po.git -This product depends on HTTP Extension and Emulation Protocol Specification 3.0.0-alpha-55 +This product depends on HTTP Extension and Emulation Protocol Specification 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/specification.httpxe -This product depends on TCP Protocol Specification 3.0.0-alpha-55 +This product depends on TCP Protocol Specification 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/k3po/specification.tcp -This product depends on UDP Protocol Specification 3.0.0-alpha-55 +This product depends on UDP Protocol Specification 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/k3po/specification.udp -This product depends on Websocket Protocol (RFC-6455) Specification 3.0.0-alpha-55 +This product depends on Websocket Protocol (RFC-6455) Specification 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/specification.ws -This product depends on WebSocket Emulation Protocol Specification 3.0.0-alpha-55 +This product depends on WebSocket Emulation Protocol Specification 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/specification.wse -This product depends on WebSocket x-kaazing-idle-timeout Specification 3.0.0-alpha-55 +This product depends on WebSocket x-kaazing-idle-timeout Specification 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/specification.x-kaazing-idle-timeout -This product depends on WebSocket Extension: x-kaazing-ping-pong Specification 3.0.0-alpha-55 +This product depends on WebSocket Extension: x-kaazing-ping-pong Specification 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/k3po/k3po.git diff --git a/distribution/pom.xml b/distribution/pom.xml index 7e2da6ef8c..6f83933bab 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -276,7 +276,7 @@ src/main/gateway/NOTICE.txt target/NOTICE.txt - + The Notice.txt file from src/main/gateway is not up-to-date. Update it and commit the changes. diff --git a/distribution/src/main/gateway/NOTICE.txt b/distribution/src/main/gateway/NOTICE.txt index 5d174b67dc..e8e3cf2125 100644 --- a/distribution/src/main/gateway/NOTICE.txt +++ b/distribution/src/main/gateway/NOTICE.txt @@ -3,20 +3,20 @@ This product depends on FindBugs-jsr305 2.0.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://findbugs.sourceforge.net/ -This product depends on hazelcast 1.9.4.8 +This product depends on hazelcast 3.7.4 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://www.hazelcast.com/hazelcast/ -This product depends on hazelcast-client 1.9.4.8 +This product depends on hazelcast-aws 1.1.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://www.hazelcast.com/hazelcast-client/ + Homepage: http://www.hazelcast.com/ -This product depends on hazelcast-cloud 1.9.4.8 +This product depends on hazelcast-client 3.7.4 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://www.hazelcast.com/hazelcast-cloud/ + Homepage: http://www.hazelcast.com/hazelcast-client/ This product depends on Commons CLI 1.2 @@ -363,12 +363,7 @@ This product depends on Gateway Utils develop-SNAPSHOT License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.util.git -This product depends on k3po/junit 3.0.0-alpha-55 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/k3po - -This product depends on k3po/lang 3.0.0-alpha-55 +This product depends on k3po/lang 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/k3po @@ -398,16 +393,6 @@ This product depends on Kaazing's Modified Mina Netty Adapter develop-SNAPSHOT License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/mina.netty.git -This product depends on Net API 1.1.0.9 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/net.api/net.api - -This product depends on Net TCP Implementation 1.1.0.9 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/net.api/net.tcp - This product depends on SNMP4J 1.11.3 License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) @@ -418,11 +403,6 @@ This product depends on SNMP4J-Agent 1.4.3 License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) Homepage: https://github.com/kaazing/snmp4j.agent -This product depends on Test Utils develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/test.util.git - This product depends on SLF4J API Module 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) diff --git a/pom.xml b/pom.xml index 95b3f66ed2..02eb40edf4 100644 --- a/pom.xml +++ b/pom.xml @@ -427,7 +427,7 @@ NOTICE.txt target/NOTICE.txt - + The top level Notice.txt file is not up-to-date. Update it and commit the changes. From c7688e8a0e229da0ffb256147fe8d10fb3f3d9ed Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Thu, 5 Jan 2017 14:42:29 +0200 Subject: [PATCH 14/53] Implemented feedback changes --- NOTICE.txt | 346 +------------------------------------------ distribution/pom.xml | 25 +++- pom.xml | 60 +------- 3 files changed, 26 insertions(+), 405 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index d6edc8e805..e8e3cf2125 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,43 +1,3 @@ -This product depends on Ant 1.6 - - License: Unknown license - The project URL is not included in this dependency's pom, and thus could not be referenced here. - -This product depends on ASM Core 3.1 - - License: Unknown license - Homepage: http://asm.objectweb.org/asm/ - -This product depends on ASM Commons 3.1 - - License: Unknown license - Homepage: http://asm.objectweb.org/asm-commons/ - -This product depends on ASM Tree 3.1 - - License: Unknown license - Homepage: http://asm.objectweb.org/asm-tree/ - -This product depends on ASM Util 3.1 - - License: Unknown license - Homepage: http://asm.objectweb.org/asm-util/ - -This product depends on cglib 2.1_3 - - License: Unknown license - Homepage: http://cglib.sourceforge.net/ - -This product depends on classworlds 1.1-alpha-2 - - License: Unknown license - Homepage: http://classworlds.codehaus.org/ - -This product depends on RMock 2.0.0 - - License: ${basedir}/../tools/licenses/LICENSE.txt (RMock License) - Homepage: http://rmock.sourceforge.net - This product depends on FindBugs-jsr305 2.0.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) @@ -58,11 +18,6 @@ This product depends on hazelcast-client 3.7.4 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://www.hazelcast.com/hazelcast-client/ -This product depends on icu4j 2.6.1 - - License: Unknown license - The project URL is not included in this dependency's pom, and thus could not be referenced here. - This product depends on Commons CLI 1.2 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) @@ -83,46 +38,21 @@ This product depends on Java Unified Expression Language Implementation 2.2.7 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://juel.sourceforge.net/juel-impl/ -This product depends on dom4j 1.6.1 - - License: Unknown license - Homepage: http://dom4j.org - This product depends on Netty 3.10.5.Final License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) Homepage: http://netty.io/ -This product depends on jaxen 1.1.1 - - License: Unknown license - Homepage: http://jaxen.codehaus.org/ - This product depends on Javassist 3.7.ga License: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/jboss/javassist/License.html?rev=HEAD&content-type=text/html (MPL 1.1) Homepage: http://labs.jboss.com/javassist/ -This product depends on jdom 1.0 - - License: Unknown license - The project URL is not included in this dependency's pom, and thus could not be referenced here. - This product depends on JUnit 4.12 License: http://www.eclipse.org/legal/epl-v10.html (Eclipse Public License 1.0) Homepage: http://junit.org -This product depends on JUnit 4.4 - - License: http://www.opensource.org/licenses/cpl1.0.txt (Common Public License Version 1.0) - Homepage: http://junit.org - -This product depends on JUnit 4.4 - - License: http://www.opensource.org/licenses/cpl1.0.txt (Common Public License Version 1.0) - Homepage: http://junit.org - This product depends on Apache Log4j 1.2.17 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) @@ -130,14 +60,9 @@ This product depends on Apache Log4j 1.2.17 This product depends on Java Native Access 3.3.0 - License: Unknown license + License: http://www.gnu.org/licenses/licenses.html (LGPL) The project URL is not included in this dependency's pom, and thus could not be referenced here. -This product depends on JOpt Simple 4.6 - - License: http://www.opensource.org/licenses/mit-license.php (The MIT License) - Homepage: http://pholser.github.com/jopt-simple - This product depends on opencsv 2.3 License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) @@ -145,7 +70,7 @@ This product depends on opencsv 2.3 This product depends on OGNL - Object Graph Navigation Library 2.7.2 - License: Unknown license + License: http://www.apache.org/licenses/ (Apache License 2) Homepage: http://ognl.org This product depends on abego TreeLayout Core 1.0.1 @@ -163,156 +88,31 @@ This product depends on ANTLR 4 Runtime 4.2.2 License: http://www.antlr.org/license.html (The BSD License) Homepage: http://www.antlr.org/antlr4-runtime -This product depends on Commons Lang 3.1 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://commons.apache.org/lang/ - -This product depends on Commons Math 3.2 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://commons.apache.org/proper/commons-math/ - -This product depends on Maven Artifact 2.0.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://maven.apache.org/maven-artifact - -This product depends on Maven Artifact Manager 2.0.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://maven.apache.org/maven-artifact-manager - -This product depends on Maven Model 2.0.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://maven.apache.org/maven-model - -This product depends on Maven Plugin API 2.0.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://maven.apache.org/maven-plugin-api - -This product depends on Maven Plugin Registry Model 2.0.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://maven.apache.org/maven-plugin-registry - -This product depends on Maven Profile Model 2.0.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://maven.apache.org/maven-profile - -This product depends on Maven Project Builder 2.0.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://maven.apache.org/maven-project - -This product depends on Maven Repository Metadata Model 2.0.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://maven.apache.org/maven-repository-metadata - -This product depends on Maven Local Settings Model 2.0.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://maven.apache.org/maven-settings - -This product depends on Maven Shade Plugin 1.1 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://maven.apache.org/plugins/maven-shade-plugin/ - -This product depends on Maven Dependency Tree 1.1 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://maven.apache.org/shared/maven-dependency-tree/ - This product depends on Apache Maven Shared Utils 3.0.0 License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache License, Version 2.0) Homepage: http://maven.apache.org/shared/maven-shared-utils/ -This product depends on Maven Wagon API 1.0-beta-2 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://maven.apache.org/wagon/wagon-provider-api - This product depends on XmlBeans 2.4.0 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://xmlbeans.apache.org -This product depends on BeanShell 2.0b4 - - License: http://www.gnu.org/licenses/lgpl.txt (GNU LESSER GENERAL PUBLIC LICENSE) - The project URL is not included in this dependency's pom, and thus could not be referenced here. - -This product depends on Default Plexus Container 1.0-alpha-9-stable-1 - - License: Unknown license - The project URL is not included in this dependency's pom, and thus could not be referenced here. - -This product depends on Plexus Common Utilities 1.4.4 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://plexus.codehaus.org/plexus-utils - -This product depends on EasyMock 2.3 - - License: http://www.easymock.org/License.html (MIT License) - Homepage: http://www.easymock.org - -This product depends on EasyMock class extension 2.3 - - License: http://www.easymock.org/License.html (MIT License) - Homepage: http://www.easymock.org - This product depends on Hamcrest Core 1.3 License: http://www.opensource.org/licenses/bsd-license.php (New BSD License) Homepage: https://github.com/hamcrest/JavaHamcrest/hamcrest-core -This product depends on Hamcrest library 1.3 - - License: http://www.opensource.org/licenses/bsd-license.php (New BSD License) - Homepage: https://github.com/hamcrest/JavaHamcrest/hamcrest-library - This product depends on JDOM 1.1 - License: Unknown license + License: https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt (JDOM License) Homepage: http://www.jdom.org/ -This product depends on jMock 2 Core 2.6.0 - - License: http://jmock.org/license.html (BSD style) - Homepage: http://nexus.sonatype.org/oss-repository-hosting.html/jmock-parent/jmock - -This product depends on jMock JUnit 4 Extension 2.6.0 - - License: http://jmock.org/license.html (BSD style) - Homepage: http://nexus.sonatype.org/oss-repository-hosting.html/jmock-parent/jmock-junit4 - -This product depends on jMock Legacy Extension 2.6.0 - - License: http://jmock.org/license.html (BSD style) - Homepage: http://nexus.sonatype.org/oss-repository-hosting.html/jmock-parent/jmock-legacy - -This product depends on jMock Script Extension 2.6.0 - - License: http://jmock.org/license.html (BSD style) - Homepage: http://nexus.sonatype.org/oss-repository-hosting.html/jmock-parent/jmock-script - This product depends on JSON (JavaScript Object Notation) 20090211 License: http://www.json.org/license.html (provided without support or warranty) Homepage: http://www.json.org/java/index.html -This product depends on Kaazing Corporation License 2.17 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/community - This product depends on Kaazing Corporation License 2.18 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) @@ -503,11 +303,6 @@ This product depends on Update Check Management Service develop-SNAPSHOT License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.service.update.check.management.git -This product depends on Keystore and Truststore used for testing TLS 1.0.0.24 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.test.ca.git - This product depends on Transport Core develop-SNAPSHOT License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) @@ -568,11 +363,6 @@ This product depends on Gateway Utils develop-SNAPSHOT License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/gateway.util.git -This product depends on k3po/junit 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/k3po - This product depends on k3po/lang 3.0.0-alpha-58 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) @@ -603,26 +393,6 @@ This product depends on Kaazing's Modified Mina Netty Adapter develop-SNAPSHOT License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: https://github.com/kaazing/mina.netty.git -This product depends on Net API 1.1.0.9 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/net.api/net.api - -This product depends on Net TCP Implementation 1.1.0.9 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/net.api/net.tcp - -This product depends on Net Extensions Common 0.4.0 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/netx - -This product depends on Net Data Implementation 0.4.0 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/netx - This product depends on SNMP4J 1.11.3 License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) @@ -633,101 +403,16 @@ This product depends on SNMP4J-Agent 1.4.3 License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) Homepage: https://github.com/kaazing/snmp4j.agent -This product depends on AMQP Protocol Specification 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/k3po/k3po/tree/develop/specification/specification.amqp.0.9.1 - -This product depends on HTTP Protocol Specification 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/k3po/specification.http - -This product depends on HTTPX Protocol Specification 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/k3po/k3po.git - -This product depends on HTTP Extension and Emulation Protocol Specification 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/specification.httpxe - -This product depends on TCP Protocol Specification 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/k3po/specification.tcp - -This product depends on UDP Protocol Specification 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/k3po/specification.udp - -This product depends on Websocket Protocol (RFC-6455) Specification 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/specification.ws - -This product depends on WebSocket Emulation Protocol Specification 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/specification.wse - -This product depends on WebSocket x-kaazing-idle-timeout Specification 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/specification.x-kaazing-idle-timeout - -This product depends on WebSocket Extension: x-kaazing-ping-pong Specification 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/k3po/k3po.git - -This product depends on Test Utils develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/test.util.git - -This product depends on Objenesis 1.0 - - License: http://objenesis.googlecode.com/svn/docs/license.html (MIT License) - Homepage: http://objenesis.googlecode.com/svn/docs/index.html - -This product depends on JMH Core 1.14 - - License: http://openjdk.java.net/legal/gplv2+ce.html (GNU General Public License (GPL), version 2, with the Classpath exception) - Homepage: http://openjdk.java.net/projects/code-tools/jmh/jmh-core/ - -This product depends on JMH Generators: Annotation Processors 1.14 - - License: http://openjdk.java.net/legal/gplv2+ce.html (GNU General Public License (GPL), version 2, with the Classpath exception) - Homepage: http://openjdk.java.net/projects/code-tools/jmh/jmh-generator-annprocess/ - -This product depends on JCL 1.1.1 implemented over SLF4J 1.7.21 - - License: http://www.opensource.org/licenses/mit-license.php (MIT License) - Homepage: http://www.slf4j.org - This product depends on SLF4J API Module 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) Homepage: http://www.slf4j.org -This product depends on SLF4J JDK14 Binding 1.7.21 - - License: http://www.opensource.org/licenses/mit-license.php (MIT License) - Homepage: http://www.slf4j.org - This product depends on SLF4J LOG4J-12 Binding 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) Homepage: http://www.slf4j.org -This product depends on PMD 4.2 - - License: Unknown license - Homepage: http://pmd.sourceforge.net/ - This product depends on StAX API 1.0.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) @@ -738,28 +423,3 @@ This product depends on Agrona 0.4.12 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache License, Version 2.0) Homepage: https://github.com/real-logic/Agrona -This product depends on xalan 2.6.0 - - License: Unknown license - The project URL is not included in this dependency's pom, and thus could not be referenced here. - -This product depends on xercesImpl 2.6.2 - - License: Unknown license - The project URL is not included in this dependency's pom, and thus could not be referenced here. - -This product depends on xmlParserAPIs 2.6.2 - - License: Unknown license - The project URL is not included in this dependency's pom, and thus could not be referenced here. - -This product depends on xml-apis 1.3.02 - - License: Unknown license - Homepage: http://xml.apache.org/commons/#external - -This product depends on xom 1.0 - - License: null (LGPL) - Homepage: http://www.xom.nu - diff --git a/distribution/pom.xml b/distribution/pom.xml index 6f83933bab..e7d438d789 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -254,6 +254,13 @@ src/license/THIRD-PARTY.properties true + + + org.kaazing + community.notice + ${community.version} + + @@ -267,6 +274,13 @@ org.apache.maven.plugins maven-enforcer-plugin ${maven.enforcer.version} + + + org.kaazing + community.enforcer + ${community.version} + + default-enforce @@ -274,9 +288,14 @@ false - src/main/gateway/NOTICE.txt - target/NOTICE.txt - The Notice.txt file from src/main/gateway is not up-to-date. Update it and commit the changes. + ../NOTICE.txt + ${project.build.directory}/NOTICE.txt + The top level Notice.txt file is not up-to-date. Update it and commit the changes. + + + ${project.basedir}/src/main/gateway/NOTICE.txt + ${project.build.directory}/NOTICE.txt + The Notice.txt file from distribution/src/main/gateway is not up-to-date. Update it and commit the changes. diff --git a/pom.xml b/pom.xml index 02eb40edf4..b92da3c11d 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ -Xmx1024m 2.3 1.14 - 2.24 + 2.25 1.10 1.4.1 @@ -380,64 +380,6 @@ - - org.codehaus.mojo - license-maven-plugin - ${codehaus.license.version} - false - - ${project.build.directory} - NOTICE.txt - org/kaazing/community/notice/third-party-template.ftl - - - - org.kaazing - community.notice - ${community.version} - - - - - - aggregate-add-third-party - - generate-resources - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven.enforcer.version} - false - - - org.kaazing - community.enforcer - ${community.version} - - - - - default-enforce - - false - - - NOTICE.txt - target/NOTICE.txt - The top level Notice.txt file is not up-to-date. Update it and commit the changes. - - - - - enforce - - verify - - - From 815248154d44a2a7513b757866f14c0b2434e4e0 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Fri, 6 Jan 2017 13:28:59 +0200 Subject: [PATCH 15/53] Removed Kaazing dependencies from the Notice.txt file --- NOTICE.txt | 290 ----------------------- distribution/pom.xml | 1 + distribution/src/main/gateway/NOTICE.txt | 290 ----------------------- 3 files changed, 1 insertion(+), 580 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index e8e3cf2125..68730ce448 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -113,296 +113,6 @@ This product depends on JSON (JavaScript Object Notation) 20090211 License: http://www.json.org/license.html (provided without support or warranty) Homepage: http://www.json.org/java/index.html -This product depends on Kaazing Corporation License 2.18 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/community - -This product depends on Kaazing Gateway Bridge develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway/bridge/gateway.bridge - -This product depends on Kaazing WebSocket Gateway - Java Client Bridge 5.0.0.5 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.client.java.bridge - -This product depends on Kaazing WebSocket Gateway - Java Client Transport 5.0.0.6 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.client.java.transport.git - -This product depends on Kaazing Gateway Client Javascript Bridge Packaging develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway/bridge/gateway.client.javascript.bridge - -This product depends on Kaazing WebSocket Gateway - Management develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.management.git - -This product depends on Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.git - -This product depends on Http Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.http.git - -This product depends on Httpx Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.httpx.git - -This product depends on Httpxdraft Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.httpxdraft.git - -This product depends on Httpxe Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.httpxe.git - -This product depends on Pipe Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.pipe.git - -This product depends on Rtmp Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.rtmp.git - -This product depends on Sse Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.sse.git - -This product depends on Ssl Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.ssl.git - -This product depends on Tcp Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.tcp.git - -This product depends on Udp Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.udp.git - -This product depends on Ws Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.ws.git - -This product depends on Wsdraft Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.wsdraft.git - -This product depends on Wse Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.wse.git - -This product depends on Wsn Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.wsn.git - -This product depends on Wsx Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.wsx.git - -This product depends on Wsxdraft Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.wsxdraft.git - -This product depends on Gateway Security develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.security.git - -This product depends on Kaazing WebSocket Gateway - Server develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.server.git - -This product depends on Kaazing WebSocket Gateway - Server API develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.server.api.git - -This product depends on Kaazing WebSocket Gateway - Server Service Provider Interface develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.server.spi.git - -This product depends on Gateway Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.git - -This product depends on Kaazing WebSocket Gateway - AMQP Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/amqp.server.git - -This product depends on Broadcast Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.broadcast.git - -This product depends on Echo Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.echo.git - -This product depends on Http Balancer Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.http.balancer.git - -This product depends on Http Directory Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.http.directory.git - -This product depends on Http Proxy Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway/service/gateway.service.http.proxy - -This product depends on Proxy Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.proxy.git - -This product depends on TURN REST Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.turn.rest.git - -This product depends on Update Check Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.update.check.git - -This product depends on Update Check Management Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.update.check.management.git - -This product depends on Transport Core develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.git - -This product depends on BIO Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.bio.git - -This product depends on Http Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.http.git - -This product depends on NIO Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.nio.git - -This product depends on Pipe Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.pipe.git - -This product depends on Sse Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.sse.git - -This product depends on SSL Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.ssl.git - -This product depends on WS Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.ws.git - -This product depends on WSEB Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.wseb.git - -This product depends on WSN Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.wsn.git - -This product depends on Kaazing WebSocket Gateway - Truststore 1.0.0.81 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.truststore.git - -This product depends on Gateway Utils develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.util.git - -This product depends on k3po/lang 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/k3po - -This product depends on Apache MINA Core develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) - Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-core - -This product depends on Apache MINA JavaBeans Integration develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) - Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-beans - -This product depends on Apache MINA JMX Integration develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) - Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-jmx - -This product depends on Apache MINA OGNL Integration develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) - Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-ognl - -This product depends on Kaazing's Modified Mina Netty Adapter develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/mina.netty.git - -This product depends on SNMP4J 1.11.3 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) - Homepage: https://github.com/kaazing/snmp4j - -This product depends on SNMP4J-Agent 1.4.3 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) - Homepage: https://github.com/kaazing/snmp4j.agent - This product depends on SLF4J API Module 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) diff --git a/distribution/pom.xml b/distribution/pom.xml index e7d438d789..eba8e86c5a 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -253,6 +253,7 @@ true src/license/THIRD-PARTY.properties true + org.kaazing.* diff --git a/distribution/src/main/gateway/NOTICE.txt b/distribution/src/main/gateway/NOTICE.txt index e8e3cf2125..68730ce448 100644 --- a/distribution/src/main/gateway/NOTICE.txt +++ b/distribution/src/main/gateway/NOTICE.txt @@ -113,296 +113,6 @@ This product depends on JSON (JavaScript Object Notation) 20090211 License: http://www.json.org/license.html (provided without support or warranty) Homepage: http://www.json.org/java/index.html -This product depends on Kaazing Corporation License 2.18 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/community - -This product depends on Kaazing Gateway Bridge develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway/bridge/gateway.bridge - -This product depends on Kaazing WebSocket Gateway - Java Client Bridge 5.0.0.5 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.client.java.bridge - -This product depends on Kaazing WebSocket Gateway - Java Client Transport 5.0.0.6 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.client.java.transport.git - -This product depends on Kaazing Gateway Client Javascript Bridge Packaging develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway/bridge/gateway.client.javascript.bridge - -This product depends on Kaazing WebSocket Gateway - Management develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.management.git - -This product depends on Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.git - -This product depends on Http Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.http.git - -This product depends on Httpx Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.httpx.git - -This product depends on Httpxdraft Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.httpxdraft.git - -This product depends on Httpxe Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.httpxe.git - -This product depends on Pipe Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.pipe.git - -This product depends on Rtmp Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.rtmp.git - -This product depends on Sse Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.sse.git - -This product depends on Ssl Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.ssl.git - -This product depends on Tcp Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.tcp.git - -This product depends on Udp Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.udp.git - -This product depends on Ws Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.ws.git - -This product depends on Wsdraft Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.wsdraft.git - -This product depends on Wse Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.wse.git - -This product depends on Wsn Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.wsn.git - -This product depends on Wsx Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.wsx.git - -This product depends on Wsxdraft Resource Address develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.resource.address.wsxdraft.git - -This product depends on Gateway Security develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.security.git - -This product depends on Kaazing WebSocket Gateway - Server develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.server.git - -This product depends on Kaazing WebSocket Gateway - Server API develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.server.api.git - -This product depends on Kaazing WebSocket Gateway - Server Service Provider Interface develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.server.spi.git - -This product depends on Gateway Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.git - -This product depends on Kaazing WebSocket Gateway - AMQP Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/amqp.server.git - -This product depends on Broadcast Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.broadcast.git - -This product depends on Echo Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.echo.git - -This product depends on Http Balancer Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.http.balancer.git - -This product depends on Http Directory Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.http.directory.git - -This product depends on Http Proxy Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway/service/gateway.service.http.proxy - -This product depends on Proxy Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.proxy.git - -This product depends on TURN REST Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.turn.rest.git - -This product depends on Update Check Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.update.check.git - -This product depends on Update Check Management Service develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.service.update.check.management.git - -This product depends on Transport Core develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.git - -This product depends on BIO Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.bio.git - -This product depends on Http Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.http.git - -This product depends on NIO Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.nio.git - -This product depends on Pipe Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.pipe.git - -This product depends on Sse Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.sse.git - -This product depends on SSL Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.ssl.git - -This product depends on WS Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.ws.git - -This product depends on WSEB Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.wseb.git - -This product depends on WSN Transport develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.transport.wsn.git - -This product depends on Kaazing WebSocket Gateway - Truststore 1.0.0.81 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.truststore.git - -This product depends on Gateway Utils develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/gateway.util.git - -This product depends on k3po/lang 3.0.0-alpha-58 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/k3po - -This product depends on Apache MINA Core develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) - Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-core - -This product depends on Apache MINA JavaBeans Integration develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) - Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-beans - -This product depends on Apache MINA JMX Integration develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) - Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-jmx - -This product depends on Apache MINA OGNL Integration develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0 (Apache 2.0 License) - Homepage: https://github.com/kaazing/gateway/mina.core/parent/mina-integration-ognl - -This product depends on Kaazing's Modified Mina Netty Adapter develop-SNAPSHOT - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: https://github.com/kaazing/mina.netty.git - -This product depends on SNMP4J 1.11.3 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) - Homepage: https://github.com/kaazing/snmp4j - -This product depends on SNMP4J-Agent 1.4.3 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) - Homepage: https://github.com/kaazing/snmp4j.agent - This product depends on SLF4J API Module 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) From afdea18d7b78c2c2ace17bb8fe73af433c6a4744 Mon Sep 17 00:00:00 2001 From: apirvu Date: Mon, 9 Jan 2017 18:40:20 +0200 Subject: [PATCH 16/53] Fixed digest auth script --- .../http.proxy.auth.authentication.digest.rpt | 119 +++++------------- 1 file changed, 32 insertions(+), 87 deletions(-) diff --git a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt index 7e2fc437cd..d9669ac39c 100644 --- a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt +++ b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.digest.rpt @@ -18,46 +18,28 @@ # client # -connect tcp://localhost:8110 +connect http://localhost:8110/resource connected -write "GET /digest-auth/auth/user/passwd HTTP/1.1\r\n" -write "Host: localhost:8110\r\n" -write "Connection: keep-alive\r\n" -write "Upgrade-Insecure-Requests: 1\r\n" -write "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" -write "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8\r\n" -write "Accept-Encoding: gzip, deflate, sdch\r\n" -write "Accept-Language: en-US,en;q=0.8\r\n" -write "\r\n" +write method "GET" +write close -read "HTTP/1.1 401 UNAUTHORIZED\r\n" -read "Access-Control-Allow-Credentials: true\r\n" -read "Access-Control-Allow-Origin: *\r\n" -read "Content-Length: 0\r\n" -read "Content-Type: text/html\r\n" -read "Date: Mon, 04 Jul 2016 13:31:49 GMT\r\n" -read "Server: nginx\r\n" -read "Set-Cookie: fake=fake_value\r\n" -read "WWW-Authenticate: Digest nonce=\"3e54b63ce55dbab8a04c253b99ab8417\"\r\n" -read "WWW-Authenticate: opaque=\"e8729fa1f90b7f746723b56f180b9ec9\"\r\n" -read "WWW-Authenticate: realm=\"me@kennethreitz.com\"\r\n" -read "WWW-Authenticate: qop=auth\r\n" -read "\r\n" +read status "401" "UNAUTHORIZED" +read header "WWW-Authenticate" "Digest nonce=\"3e54b63ce55dbab8a04c253b99ab8417\"" +read header "WWW-Authenticate" "opaque=\"e8729fa1f90b7f746723b56f180b9ec9\"" +read header "WWW-Authenticate" "realm=\"me@kennethreitz.com\"" +read header "WWW-Authenticate" "qop=auth" +read notify FIRST_DONE -write "GET /digest-auth/auth/user/passwd HTTP/1.1\r\n" -write "Host: localhost:8110\r\n" -write "Connection: keep-alive\r\n" -write "Authorization: Digest username=\"userDigest\", realm=\"\", nonce=\"3e54b63ce55dbab8a04c253b99ab8417\", uri=\"/digest-auth/auth/user/passwd\", response=\"216349453d8c5b003b94bd875fe9c2d4\"\r\n" -write "Upgrade-Insecure-Requests: 1\r\n" -write "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" -write "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8\r\n" -write "Accept-Encoding: gzip, deflate, sdch\r\n" -write "Accept-Language: en-US,en;q=0.8\r\n" -write "Cookie: fake=fake_value\r\n" -write "\r\n" +connect await FIRST_DONE +connect http://localhost:8110/resource +connected + +write method "GET" +write header "Authorization" "Digest username=\"userDigest\", realm=\"\", nonce=\"3e54b63ce55dbab8a04c253b99ab8417\", uri=\"/resource\", response=\"216349453d8c5b003b94bd875fe9c2d4\"" +write close -read "HTTP/1.1 200 OK\r\n" +read status "200" "OK" close closed @@ -66,62 +48,25 @@ closed # server # -accept tcp://localhost:8080 +accept http://localhost:8080/resource accepted connected -read "GET /digest-auth/auth/user/passwd HTTP/1.1\r\n" -read /Via: 1.1 kaazing-.+/ "\r\n" -read "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" -read "Upgrade-Insecure-Requests: 1\r\n" -read "Host: localhost:8080\r\n" -read "Accept-Language: en-US\r\n" -read "Accept-Language: en;q=0.8\r\n" -read "Accept-Encoding: gzip\r\n" -read "Accept-Encoding: deflate\r\n" -read "Accept-Encoding: sdch\r\n" -read "Accept: text/html\r\n" -read "Accept: application/xhtml+xml\r\n" -read "Accept: application/xml;q=0.9\r\n" -read "Accept: image/webp\r\n" -read "Accept: */*;q=0.8\r\n" -read "\r\n" +read method "GET" +read closed -write "HTTP/1.1 401 UNAUTHORIZED\r\n" -write "Access-Control-Allow-Credentials: true\r\n" -write "Access-Control-Allow-Origin: *\r\n" -write "Content-Length: 0\r\n" -write "Content-Type: text/html\r\n" -write "Date: Mon, 04 Jul 2016 13:31:49 GMT\r\n" -write "Server: nginx\r\n" -write "Set-Cookie: fake=fake_value\r\n" -write "WWW-Authenticate: Digest nonce=\"3e54b63ce55dbab8a04c253b99ab8417\"\r\n" -write "WWW-Authenticate: opaque=\"e8729fa1f90b7f746723b56f180b9ec9\"\r\n" -write "WWW-Authenticate: realm=\"me@kennethreitz.com\"\r\n" -write "WWW-Authenticate: qop=auth\r\n" -write "\r\n" +write status "401" "UNAUTHORIZED" +write header "WWW-Authenticate" "Digest nonce=\"3e54b63ce55dbab8a04c253b99ab8417\"" +write header "WWW-Authenticate" "opaque=\"e8729fa1f90b7f746723b56f180b9ec9\"" +write header "WWW-Authenticate" "realm=\"me@kennethreitz.com\"" +write header "WWW-Authenticate" "qop=auth" +write flush -read "GET /digest-auth/auth/user/passwd HTTP/1.1\r\n" -read /Via: 1.1 kaazing-.+/ "\r\n" -read "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" -read "Upgrade-Insecure-Requests: 1\r\n" -read "Host: localhost:8080\r\n" -read "Cookie: fake=fake_value\r\n" -read "Authorization: Digest username=\"userDigest\", realm=\"\", nonce=\"3e54b63ce55dbab8a04c253b99ab8417\", uri=\"/digest-auth/auth/user/passwd\", response=\"216349453d8c5b003b94bd875fe9c2d4\"\r\n" -read "Accept-Language: en-US\r\n" -read "Accept-Language: en;q=0.8\r\n" -read "Accept-Encoding: gzip\r\n" -read "Accept-Encoding: deflate\r\n" -read "Accept-Encoding: sdch\r\n" -read "Accept: text/html\r\n" -read "Accept: application/xhtml+xml\r\n" -read "Accept: application/xml;q=0.9\r\n" -read "Accept: image/webp\r\n" -read "Accept: */*;q=0.8\r\n" -read "\r\n" - -write "HTTP/1.1 200 OK\r\n" +accepted +connected -close -closed +read method "GET" +read header "Authorization" "Digest username=\"userDigest\", realm=\"\", nonce=\"3e54b63ce55dbab8a04c253b99ab8417\", uri=\"/resource\", response=\"216349453d8c5b003b94bd875fe9c2d4\"" +write status "200" "OK" +write close From 72805e9399c6e9bdade2b7b5ebce45098d317369 Mon Sep 17 00:00:00 2001 From: apirvu Date: Mon, 9 Jan 2017 18:46:59 +0200 Subject: [PATCH 17/53] Modified auth class back --- .../http/proxy/HttpProxyAuthenticationIT.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java index 0e8551407d..e0c0591660 100644 --- a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java +++ b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java @@ -36,13 +36,13 @@ public class HttpProxyAuthenticationIT { // @formatter:off GatewayConfiguration configuration = new GatewayConfigurationBuilder() - .property(EarlyAccessFeatures.HTTP_PROXY_SERVICE.getPropertyName(), "true") - .service() + .property(EarlyAccessFeatures.HTTP_PROXY_SERVICE.getPropertyName(), "true") + .service() .accept("http://localhost:8110") .connect("http://localhost:8080") .type("http.proxy") - .done() - .done(); + .done() + .done(); // @formatter:on init(configuration); }}; @@ -122,16 +122,10 @@ public void authenticationDigest() throws Exception { robot.finish(); } - @Test - @Specification("auth/http.proxy.auth.authentication.basic.tcp") - public void authenticationBasicTcp() throws Exception { - robot.finish(); - } - @Test @Specification("auth/http.proxy.auth.authentication.basic") - public void authenticationBasicHttp() throws Exception { + public void authenticationBasic() throws Exception { robot.finish(); } -} +} \ No newline at end of file From 554513a4d3dec3ec5a62f088c6dd5b5442cdf03d Mon Sep 17 00:00:00 2001 From: apirvu Date: Mon, 9 Jan 2017 18:49:08 +0200 Subject: [PATCH 18/53] working on basic auth script --- .../http.proxy.auth.authentication.basic.rpt | 2 +- ...tp.proxy.auth.authentication.basic.tcp.rpt | 118 ------------------ 2 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.tcp.rpt diff --git a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt index 904cb1af7d..3c222fb20c 100644 --- a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt +++ b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt @@ -24,7 +24,7 @@ connected write method "GET" write parameter "/basic-auth/user/passwd" write version "HTTP/1.1" -write header "User-Agent" "curl/7.37.1" +write header "User-Agent" "curl/7.37.1" write header "Host" "localhost:8110" write header "Accept" "*/*" diff --git a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.tcp.rpt b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.tcp.rpt deleted file mode 100644 index aace812330..0000000000 --- a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.tcp.rpt +++ /dev/null @@ -1,118 +0,0 @@ -# -# Copyright 2007-2016, Kaazing Corporation. 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. -# - -# -# client -# - -connect tcp://localhost:8110 -connected - -write "GET /basic-auth/user/passwd HTTP/1.1\r\n" -write "Host: localhost:8110\r\n" -write "Connection: keep-alive\r\n" -write "Upgrade-Insecure-Requests: 1\r\n" -write "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" -write "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8\r\n" -write "DNT: 1\r\n" -write "Accept-Encoding: gzip, deflate, sdch\r\n" -write "Accept-Language: en-US,en;q=0.8\r\n" -write "\r\n" - -read "HTTP/1.1 401 UNAUTHORIZED\r\n" -read "Access-Control-Allow-Credentials: true\r\n" -read "Access-Control-Allow-Origin: *\r\n" -read "Content-Length: 0\r\n" -read "Content-Type: text/html\r\n" -read "Date: Mon, 04 Jul 2016 14:46:44 GMT\r\n" -read "Server: nginx\r\n" -read "WWW-Authenticate: Basic realm=\"Fake Realm\"\r\n" -read "\r\n" - -write "GET /basic-auth/user/passwd HTTP/1.1\r\n" -write "Host: localhost:8110\r\n" -write "Connection: keep-alive\r\n" -write "Authorization: Basic bmFtZUF1dGg6UGFzc0F1dGg=\r\n" -write "Upgrade-Insecure-Requests: 1\r\n" -write "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" -write "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8\r\n" -write "Accept-Encoding: gzip, deflate, sdch\r\n" -write "Accept-Language: en-US,en;q=0.8\r\n" -write "\r\n" - -read "HTTP/1.1 200 OK\r\n" - -close -closed - -# -# server -# - -accept tcp://localhost:8080 -accepted -connected - -read "GET /basic-auth/user/passwd HTTP/1.1\r\n" -read /Via: 1.1 kaazing-.+/ "\r\n" -read "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" -read "Upgrade-Insecure-Requests: 1\r\n" -read "Host: localhost:8080\r\n" -read "DNT: 1\r\n" -read "Accept-Language: en-US\r\n" -read "Accept-Language: en;q=0.8\r\n" -read "Accept-Encoding: gzip\r\n" -read "Accept-Encoding: deflate\r\n" -read "Accept-Encoding: sdch\r\n" -read "Accept: text/html\r\n" -read "Accept: application/xhtml+xml\r\n" -read "Accept: application/xml;q=0.9\r\n" -read "Accept: image/webp\r\n" -read "Accept: */*;q=0.8\r\n" -read "\r\n" - -write "HTTP/1.1 401 UNAUTHORIZED\r\n" -write "Access-Control-Allow-Credentials: true\r\n" -write "Access-Control-Allow-Origin: *\r\n" -write "Content-Length: 0\r\n" -write "Content-Type: text/html\r\n" -write "Date: Mon, 04 Jul 2016 14:46:44 GMT\r\n" -write "Server: nginx\r\n" -write "WWW-Authenticate: Basic realm=\"Fake Realm\"\r\n" -write "\r\n" - -read "GET /basic-auth/user/passwd HTTP/1.1\r\n" -read /Via: 1.1 kaazing-.+/ "\r\n" -read "User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\r\n" -read "Upgrade-Insecure-Requests: 1\r\n" -read "Host: localhost:8080\r\n" -read "Authorization: Basic bmFtZUF1dGg6UGFzc0F1dGg=\r\n" -read "Accept-Language: en-US\r\n" -read "Accept-Language: en;q=0.8\r\n" -read "Accept-Encoding: gzip\r\n" -read "Accept-Encoding: deflate\r\n" -read "Accept-Encoding: sdch\r\n" -read "Accept: text/html\r\n" -read "Accept: application/xhtml+xml\r\n" -read "Accept: application/xml;q=0.9\r\n" -read "Accept: image/webp\r\n" -read "Accept: */*;q=0.8\r\n" -read "\r\n" - -write "HTTP/1.1 200 OK\r\n" - -close -closed \ No newline at end of file From 46763b9bd78b79d6e96d758382049d8930fb0d07 Mon Sep 17 00:00:00 2001 From: apirvu Date: Mon, 9 Jan 2017 19:27:50 +0200 Subject: [PATCH 19/53] Fixed basic auth script --- .../http/proxy/HttpProxyAuthenticationIT.java | 8 +-- .../http.proxy.auth.authentication.basic.rpt | 56 +++++++------------ 2 files changed, 25 insertions(+), 39 deletions(-) diff --git a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java index e0c0591660..df77736404 100644 --- a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java +++ b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java @@ -36,13 +36,13 @@ public class HttpProxyAuthenticationIT { // @formatter:off GatewayConfiguration configuration = new GatewayConfigurationBuilder() - .property(EarlyAccessFeatures.HTTP_PROXY_SERVICE.getPropertyName(), "true") - .service() + .property(EarlyAccessFeatures.HTTP_PROXY_SERVICE.getPropertyName(), "true") + .service() .accept("http://localhost:8110") .connect("http://localhost:8080") .type("http.proxy") - .done() - .done(); + .done() + .done(); // @formatter:on init(configuration); }}; diff --git a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt index 3c222fb20c..eaf1b49fd7 100644 --- a/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt +++ b/service/http.proxy/src/test/scripts/org/kaazing/gateway/service/http/proxy/auth/http.proxy.auth.authentication.basic.rpt @@ -18,28 +18,25 @@ # client # -connect http://localhost:8110/hello + +connect http://localhost:8110/resource connected write method "GET" -write parameter "/basic-auth/user/passwd" -write version "HTTP/1.1" -write header "User-Agent" "curl/7.37.1" -write header "Host" "localhost:8110" -write header "Accept" "*/*" - - -read status "401" "UNAUTHORIZED" -read version "HTTP/1.1" +write header "Authorization" "Basic" +write close +read status "401" "Unauthorized" +read header "WWW-Authenticate" /Basic realm=.+/ +read notify FIRST_REQUEST_COMPLETE +connect await FIRST_REQUEST_COMPLETE +connect http://localhost:8110/resource +connected write method "GET" -write parameter "/basic-auth/user/passwd" -write parameter "HTTP/1.1" -write header "User-Agent" "curl/7.37.1" -write header "Host" "localhost:8110" -write header "Accept" "*/*" +write header "Authorization" "am9lOndlbGNvbWUNCg==" +write close read status "200" "OK" @@ -50,34 +47,23 @@ closed # server # - - -accept http://localhost:8080/hello +accept http://localhost:8080/resource accepted connected - - read method "GET" -write parameter "/basic-auth/user/passwd" -write version "HTTP/1.1" -read header "Via" "1.1 kaazing" -read header "User-Agent" "curl/7.37.1" -read header "Host" "localhost:8080" -read header "Accept" "*/*" +read header "Authorization" "Basic" read closed -write status "401" "UNAUTHORIZED" -write version "HTTP/1.1" +write status "401" "Unauthorized" +write header "WWW-Authenticate" "Basic realm=\"Kaazing Gateway Demo\"" +write flush + +accepted +connected read method "GET" -write parameter "/basic-auth/user/passwd" -write parameter "HTTP/1.1" -read header "Via" "1.1 kaazing" -read header "User-Agent" "curl/7.37.1" -read header "Host" "localhost:8080" -read header "Accept" "*/*" -read closed +read header "Authorization" "am9lOndlbGNvbWUNCg==" write status "200" "OK" write close From 7fa72241f5bf1d1412d013a6dddb6995c06f1cad Mon Sep 17 00:00:00 2001 From: apirvu Date: Mon, 9 Jan 2017 19:30:13 +0200 Subject: [PATCH 20/53] Modified indentation back --- .../service/http/proxy/HttpProxyAuthenticationIT.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java index df77736404..335742ed0c 100644 --- a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java +++ b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java @@ -36,12 +36,12 @@ public class HttpProxyAuthenticationIT { // @formatter:off GatewayConfiguration configuration = new GatewayConfigurationBuilder() - .property(EarlyAccessFeatures.HTTP_PROXY_SERVICE.getPropertyName(), "true") - .service() + .property(EarlyAccessFeatures.HTTP_PROXY_SERVICE.getPropertyName(), "true") + .service() .accept("http://localhost:8110") .connect("http://localhost:8080") .type("http.proxy") - .done() + .done() .done(); // @formatter:on init(configuration); From 8b03526d8f4f82386eec6816c6145645fe332c5d Mon Sep 17 00:00:00 2001 From: apirvu Date: Mon, 9 Jan 2017 19:31:17 +0200 Subject: [PATCH 21/53] Added new line --- .../gateway/service/http/proxy/HttpProxyAuthenticationIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java index 335742ed0c..b07785ffd8 100644 --- a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java +++ b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyAuthenticationIT.java @@ -128,4 +128,4 @@ public void authenticationBasic() throws Exception { robot.finish(); } -} \ No newline at end of file +} From 68a729a94ebe53b62d3503846b3dbdab2f4ed843 Mon Sep 17 00:00:00 2001 From: Satish Badugu Date: Mon, 9 Jan 2017 15:58:30 -0800 Subject: [PATCH 22/53] Update ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index b643b4ae7f..eb77054528 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -6,6 +6,8 @@ #### Actual behavior +#### Logs/Wiresharks + #### Specifications 1) Gateway Java version From 6747f2a5de7cec1c8f0220133bbf5ae768c518a0 Mon Sep 17 00:00:00 2001 From: vmaraloiu Date: Fri, 13 Jan 2017 20:03:54 +0200 Subject: [PATCH 23/53] Added Log warning first time we see Http 1.0. --- .../gateway/service/http/proxy/HttpProxyServiceHandler.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/service/http.proxy/src/main/java/org/kaazing/gateway/service/http/proxy/HttpProxyServiceHandler.java b/service/http.proxy/src/main/java/org/kaazing/gateway/service/http/proxy/HttpProxyServiceHandler.java index 0e3a2220c4..e51b7b3439 100644 --- a/service/http.proxy/src/main/java/org/kaazing/gateway/service/http/proxy/HttpProxyServiceHandler.java +++ b/service/http.proxy/src/main/java/org/kaazing/gateway/service/http/proxy/HttpProxyServiceHandler.java @@ -206,6 +206,12 @@ public void sessionOpened(IoSession session) { final DefaultHttpSession acceptSession = (DefaultHttpSession) session; // final Subject subject = ((IoSessionEx) acceptSession).getSubject(); + // log warning first time we see Http 1.0 request + if (acceptSession.getVersion().toString().equals("HTTP/1.0")){ + LOGGER.warn(String.format("http.proxy service %s received an HTTP 1.0 request. HTTP 1.0 is not" + + " explicitly supported.", acceptSession.getService().toString())); + } + if (!validateRequestPath(acceptSession)) { acceptSession.setStatus(CLIENT_NOT_FOUND); acceptSession.close(false); From 98cbdfc1cb34df6839f319993abb07e47c7cc7d8 Mon Sep 17 00:00:00 2001 From: Jitendra Kotamraju Date: Fri, 13 Jan 2017 11:48:13 -0800 Subject: [PATCH 24/53] Upgrading to Agrona 0.9.1 version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 72d5b76f24..8f4417bc46 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 1.1 2.6.0 1.7.21 - 0.9.0 + 0.9.1 true -Xmx1024m From c643b7d0d79e52fc1b15f9021e8a5133858d69e6 Mon Sep 17 00:00:00 2001 From: vmaraloiu Date: Mon, 16 Jan 2017 14:31:19 +0200 Subject: [PATCH 25/53] Modify test: sendHttp_1_0_Request, in order to validate the changes. --- .../http/proxy/HttpProxyNegativeCasesIT.java | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyNegativeCasesIT.java b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyNegativeCasesIT.java index 0bcc4991b0..172ae24098 100644 --- a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyNegativeCasesIT.java +++ b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyNegativeCasesIT.java @@ -16,23 +16,37 @@ package org.kaazing.gateway.service.http.proxy; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.RuleChain; import org.junit.rules.TestRule; +import org.junit.runners.model.Statement; import org.kaazing.gateway.server.test.GatewayRule; import org.kaazing.gateway.server.test.config.GatewayConfiguration; import org.kaazing.gateway.server.test.config.builder.GatewayConfigurationBuilder; import org.kaazing.gateway.util.feature.EarlyAccessFeatures; import org.kaazing.k3po.junit.annotation.Specification; import org.kaazing.k3po.junit.rules.K3poRule; - - -import static org.kaazing.test.util.ITUtil.createRuleChain; +import org.kaazing.test.util.MemoryAppender; +import org.kaazing.test.util.MethodExecutionTrace; public class HttpProxyNegativeCasesIT { private final K3poRule robot = new K3poRule(); + private List expectedPatterns; + + private TestRule checkLogMessageRule = (base, description) -> new Statement() { + @Override + public void evaluate() throws Throwable { + base.evaluate(); + MemoryAppender.assertMessagesLogged(expectedPatterns, null, null, true); + } + }; private final GatewayRule gateway = new GatewayRule() {{ // @formatter:off @@ -50,12 +64,15 @@ public class HttpProxyNegativeCasesIT { }}; @Rule - public TestRule chain = createRuleChain(gateway, robot); + public TestRule chain = RuleChain.outerRule(new MethodExecutionTrace()).around(robot).around(checkLogMessageRule).around(gateway); @Specification("http.proxy.http.1.0.request") @Test public void sendHttp_1_0_Request() throws Exception { robot.finish(); + expectedPatterns = new ArrayList(Arrays.asList(new String[] { + "http.proxy service .*. received an HTTP 1.0 request. HTTP 1.0 is not explicitly supported." + })); } @Specification("http.proxy.http.2.0.request") From 99a7d071d4bb03f754bdc5611a2e3ec954706ffc Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Mon, 16 Jan 2017 14:44:15 +0200 Subject: [PATCH 26/53] Removed creating a `dependency-reduced-pom` file for the mina.netty module Update the maven-license-plugin version --- mina.netty/pom.xml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mina.netty/pom.xml b/mina.netty/pom.xml index 2b0164cc57..84d1aa3f9f 100644 --- a/mina.netty/pom.xml +++ b/mina.netty/pom.xml @@ -9,7 +9,7 @@ mina.netty jar - Kaazing's Modified Mina Netty Adapter + Mina Netty Adapter Implementation of mina abstractions using netty https://github.com/kaazing/mina.netty.git @@ -199,7 +199,7 @@ maven-shade-plugin 2.4.2 - ${basedir}/target/dependency-reduced-pom.xml + false ${create.shaded.sources} diff --git a/pom.xml b/pom.xml index b92da3c11d..b371824190 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ 2.3 1.14 2.25 - 1.10 + 1.12 1.4.1 From 3c65e145cbe502e372fc10d0c0ea7b9e3fdbacd9 Mon Sep 17 00:00:00 2001 From: vmaraloiu Date: Mon, 16 Jan 2017 14:45:35 +0200 Subject: [PATCH 27/53] Minor change. --- .../gateway/service/http/proxy/HttpProxyNegativeCasesIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyNegativeCasesIT.java b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyNegativeCasesIT.java index 172ae24098..b005a1e561 100644 --- a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyNegativeCasesIT.java +++ b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyNegativeCasesIT.java @@ -64,7 +64,8 @@ public void evaluate() throws Throwable { }}; @Rule - public TestRule chain = RuleChain.outerRule(new MethodExecutionTrace()).around(robot).around(checkLogMessageRule).around(gateway); + public TestRule chain = + RuleChain.outerRule(new MethodExecutionTrace()).around(robot).around(checkLogMessageRule).around(gateway); @Specification("http.proxy.http.1.0.request") @Test From 47390cdf220f11eae45851a481fc4f7ede3c7df0 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Mon, 16 Jan 2017 16:32:20 +0200 Subject: [PATCH 28/53] Updated NOTICE.txt files --- NOTICE.txt | 10 +++++----- distribution/src/main/gateway/NOTICE.txt | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 68730ce448..fe659ca6aa 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -78,6 +78,11 @@ This product depends on abego TreeLayout Core 1.0.1 License: http://treelayout.googlecode.com/files/LICENSE.TXT (BSD 3-Clause "New" or "Revised" License (BSD-3-Clause)) Homepage: http://code.google.com/p/treelayout/ +This product depends on Agrona 0.9.1 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache License, Version 2.0) + Homepage: https://github.com/real-logic/Agrona + This product depends on ANTLR 4 Runtime Annotations 4.2.2 License: http://www.antlr.org/license.html (The BSD License) @@ -128,8 +133,3 @@ This product depends on StAX API 1.0.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://stax.codehaus.org/ -This product depends on Agrona 0.4.12 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache License, Version 2.0) - Homepage: https://github.com/real-logic/Agrona - diff --git a/distribution/src/main/gateway/NOTICE.txt b/distribution/src/main/gateway/NOTICE.txt index 68730ce448..fe659ca6aa 100644 --- a/distribution/src/main/gateway/NOTICE.txt +++ b/distribution/src/main/gateway/NOTICE.txt @@ -78,6 +78,11 @@ This product depends on abego TreeLayout Core 1.0.1 License: http://treelayout.googlecode.com/files/LICENSE.TXT (BSD 3-Clause "New" or "Revised" License (BSD-3-Clause)) Homepage: http://code.google.com/p/treelayout/ +This product depends on Agrona 0.9.1 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache License, Version 2.0) + Homepage: https://github.com/real-logic/Agrona + This product depends on ANTLR 4 Runtime Annotations 4.2.2 License: http://www.antlr.org/license.html (The BSD License) @@ -128,8 +133,3 @@ This product depends on StAX API 1.0.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://stax.codehaus.org/ -This product depends on Agrona 0.4.12 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache License, Version 2.0) - Homepage: https://github.com/real-logic/Agrona - From a87b1df5a5824a6a7d060d637a44cbe18d8e631e Mon Sep 17 00:00:00 2001 From: Jitendra Kotamraju Date: Mon, 16 Jan 2017 16:53:08 -0800 Subject: [PATCH 29/53] (#850) Sync'd AbstractIoAcceptor from mina 2.0.16, fixed bind,unbind ordering in AbstractNioAcceptor by scheduling bind() onto to unbindScheduler thread so that bind() and unbind() are ordered. * Restoring to the original version. But bindAsync() and unbindAsync() are not really used anywhere --- .../mina/core/service/AbstractIoAcceptor.java | 160 +++++++++++------- .../core/service/AbstractIoAcceptorEx.java | 24 +-- .../nio/internal/AbstractNioAcceptor.java | 57 ++++--- .../nio/internal/NioDatagramAcceptorTest.java | 2 + .../nio/internal/NioSocketAcceptorTest.java | 6 +- 5 files changed, 154 insertions(+), 95 deletions(-) diff --git a/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptor.java b/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptor.java index acb1f9f27d..ab88e9b673 100644 --- a/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptor.java +++ b/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptor.java @@ -36,18 +36,17 @@ /** * A base implementation of {@link IoAcceptor}. * + * @author Apache MINA Project * @org.apache.xbean.XBean */ /* This class (based on the Mina version) is needed for use in ChannelIoAcceptor in order to use our * AbstractIoSessionEx (which requires ChannelIoAcceptor to be derived from our version of AbstractIoService). - * The following changes were made from the version in Mina 2.0.0-RC1g: + * The following changes were made from the version in Mina 2.0.16: * 1. Change package name * 2. Add imports of needed classes from the original package (org.apache.mina.core.service) * 3. Change checkAddressType, bindLock and boundAddresses from private to package-private so they can be used in * AbstractIoAcceptorEx - * 4. Fix apparent Mina bugs in bind and unbind: fire service listeners to indicate service activated or deactivated - * inside the synchronized bindLock block, to avoid possible wrong outcome in case of race between bind and unbind. - * 5. Widen scope of bind lock for subclasses. + * 4. Widen scope of bind lock for subclasses. */ public abstract class AbstractIoAcceptor extends AbstractIoService implements IoAcceptor { @@ -74,7 +73,7 @@ public abstract class AbstractIoAcceptor * null {@link Executor} is provided, a default one will be created using * {@link Executors#newCachedThreadPool()}. * - * {@see AbstractIoService#AbstractIoService(IoSessionConfig, Executor)} + * @see AbstractIoService#AbstractIoService(IoSessionConfig, Executor) * * @param sessionConfig * the default configuration for the managed {@link IoSession} @@ -106,7 +105,8 @@ public SocketAddress getLocalAddress() { @Override public final Set getLocalAddresses() { Set localAddresses = new HashSet<>(); - synchronized (bindLock) { + + synchronized (boundAddresses) { localAddresses.addAll(boundAddresses); } return localAddresses; @@ -146,7 +146,7 @@ public final List getDefaultLocalAddresses() { @Override public final void setDefaultLocalAddresses(List localAddresses) { if (localAddresses == null) { - throw new NullPointerException("localAddresses"); + throw new IllegalArgumentException("localAddresses"); } setDefaultLocalAddresses((Iterable) localAddresses); } @@ -157,28 +157,29 @@ public final void setDefaultLocalAddresses(List localAd @Override public final void setDefaultLocalAddresses(Iterable localAddresses) { if (localAddresses == null) { - throw new NullPointerException("localAddresses"); + throw new IllegalArgumentException("localAddresses"); } synchronized (bindLock) { - if (!boundAddresses.isEmpty()) { - throw new IllegalStateException( - "localAddress can't be set while the acceptor is bound."); - } + synchronized (boundAddresses) { + if (!boundAddresses.isEmpty()) { + throw new IllegalStateException("localAddress can't be set while the acceptor is bound."); + } - Collection newLocalAddresses = - new ArrayList<>(); - for (SocketAddress a: localAddresses) { - checkAddressType(a); - newLocalAddresses.add(a); - } + Collection newLocalAddresses = + new ArrayList<>(); + for (SocketAddress a: localAddresses) { + checkAddressType(a); + newLocalAddresses.add(a); + } - if (newLocalAddresses.isEmpty()) { - throw new IllegalArgumentException("empty localAddresses"); - } + if (newLocalAddresses.isEmpty()) { + throw new IllegalArgumentException("empty localAddresses"); + } - this.defaultLocalAddresses.clear(); - this.defaultLocalAddresses.addAll(newLocalAddresses); + this.defaultLocalAddresses.clear(); + this.defaultLocalAddresses.addAll(newLocalAddresses); + } } } @@ -231,7 +232,7 @@ public final void bind() throws IOException { @Override public final void bind(SocketAddress localAddress) throws IOException { if (localAddress == null) { - throw new NullPointerException("localAddress"); + throw new IllegalArgumentException("localAddress"); } List localAddresses = new ArrayList<>(1); @@ -266,11 +267,11 @@ public final void bind(SocketAddress firstLocalAddress, SocketAddress... otherLo @Override public final void bind(Iterable localAddresses) throws IOException { if (isDisposing()) { - throw new IllegalStateException("Already disposed."); + throw new IllegalStateException("The Accpetor disposed is being disposed."); } if (localAddresses == null) { - throw new NullPointerException("localAddresses"); + throw new IllegalArgumentException("localAddresses"); } List localAddressesCopy = new ArrayList<>(); @@ -286,8 +287,10 @@ public final void bind(Iterable localAddresses) throws boolean activate = false; synchronized (bindLock) { - if (boundAddresses.isEmpty()) { - activate = true; + synchronized (boundAddresses) { + if (boundAddresses.isEmpty()) { + activate = true; + } } if (getHandler() == null) { @@ -295,13 +298,18 @@ public final void bind(Iterable localAddresses) throws } try { - boundAddresses.addAll(bindInternal(localAddressesCopy)); + Set addresses = bindInternal(localAddressesCopy); + + synchronized (boundAddresses) { + boundAddresses.addAll(addresses); + } } catch (IOException | RuntimeException e) { throw e; - } catch (Throwable e) { + } catch (Exception e) { throw new RuntimeIoException( "Failed to bind to: " + getLocalAddresses(), e); } + if (activate) { getListeners().fireServiceActivated(); } @@ -323,7 +331,7 @@ public final void unbind() { @Override public final void unbind(SocketAddress localAddress) { if (localAddress == null) { - throw new NullPointerException("localAddress"); + throw new IllegalArgumentException("localAddress"); } List localAddresses = new ArrayList<>(1); @@ -338,10 +346,10 @@ public final void unbind(SocketAddress localAddress) { public final void unbind(SocketAddress firstLocalAddress, SocketAddress... otherLocalAddresses) { if (firstLocalAddress == null) { - throw new NullPointerException("firstLocalAddress"); + throw new IllegalArgumentException("firstLocalAddress"); } if (otherLocalAddresses == null) { - throw new NullPointerException("otherLocalAddresses"); + throw new IllegalArgumentException("otherLocalAddresses"); } List localAddresses = new ArrayList<>(); @@ -356,57 +364,67 @@ public final void unbind(SocketAddress firstLocalAddress, @Override public final void unbind(Iterable localAddresses) { if (localAddresses == null) { - throw new NullPointerException("localAddresses"); + throw new IllegalArgumentException("localAddresses"); } boolean deactivate = false; synchronized (bindLock) { - if (boundAddresses.isEmpty()) { - return; - } - - List localAddressesCopy = new ArrayList<>(); - int specifiedAddressCount = 0; - for (SocketAddress a: localAddresses) { - specifiedAddressCount ++; - if (a != null && boundAddresses.contains(a)) { - localAddressesCopy.add(a); + synchronized (boundAddresses) { + if (boundAddresses.isEmpty()) { + return; } - } - if (specifiedAddressCount == 0) { - throw new IllegalArgumentException("localAddresses is empty."); - } - if (!localAddressesCopy.isEmpty()) { - try { - unbind0(localAddressesCopy); - } catch (RuntimeException e) { - throw e; - } catch (Throwable e) { - throw new RuntimeIoException( - "Failed to unbind from: " + getLocalAddresses(), e); + List localAddressesCopy = new ArrayList<>(); + int specifiedAddressCount = 0; + for (SocketAddress a : localAddresses) { + specifiedAddressCount++; + if (a != null && boundAddresses.contains(a)) { + localAddressesCopy.add(a); + } + } + if (specifiedAddressCount == 0) { + throw new IllegalArgumentException("localAddresses is empty."); } - boundAddresses.removeAll(localAddressesCopy); - if (boundAddresses.isEmpty()) { - deactivate = true; + if (!localAddressesCopy.isEmpty()) { + try { + unbind0(localAddressesCopy); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new RuntimeIoException( + "Failed to unbind from: " + getLocalAddresses(), e); + } + + boundAddresses.removeAll(localAddressesCopy); + if (boundAddresses.isEmpty()) { + deactivate = true; + } } } + if (deactivate) { getListeners().fireServiceDeactivated(); } } + } /** * Starts the acceptor, and register the given addresses + * + * @param localAddresses The address to bind to * @return the {@link Set} of the local addresses which is bound actually + * @throws Exception If the bind failed */ protected abstract Set bindInternal( List localAddresses) throws Exception; /** * Implement this method to perform the actual unbind operation. + * + * @param localAddresses The address to unbind from + * @throws Exception If the unbind failed */ protected abstract void unbind0( List localAddresses) throws Exception; @@ -414,11 +432,13 @@ protected abstract void unbind0( @Override public String toString() { TransportMetadata m = getTransportMetadata(); - return '(' + m.getProviderName() + ' ' + m.getName() + " acceptor: " + - (isActive()? - "localAddress(es): " + getLocalAddresses() + - ", managedSessionCount: " + getManagedSessionCount() : - "not bound") + ')'; + return '(' + + m.getProviderName() + + ' ' + + m.getName() + + " acceptor: " + + (isActive() ? "localAddress(es): " + getLocalAddresses() + ", managedSessionCount: " + + getManagedSessionCount() : "not bound") + ')'; } void checkAddressType(SocketAddress a) { @@ -431,13 +451,24 @@ void checkAddressType(SocketAddress a) { } } + /** + * A {@Link IoFuture} + */ public static class AcceptorOperationFuture extends ServiceOperationFuture { private final List localAddresses; + /** + * Creates a new AcceptorOperationFuture instance + * + * @param localAddresses The list of local addresses to listen to + */ public AcceptorOperationFuture(List localAddresses) { this.localAddresses = new ArrayList<>(localAddresses); } + /** + * @return The list of local addresses we listen to + */ public final List getLocalAddresses() { return Collections.unmodifiableList(localAddresses); } @@ -445,6 +476,7 @@ public final List getLocalAddresses() { /** * @see Object#toString() */ + @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptorEx.java b/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptorEx.java index 6543210c6c..12060396b7 100644 --- a/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptorEx.java +++ b/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptorEx.java @@ -59,6 +59,7 @@ public BindFuture bindAsync(final SocketAddress localAddress) { if (getHandler() == null) { throw new IllegalStateException("handler is not set."); } + BindFuture bound = bindAsyncInternal(localAddress); bound.addListener(new IoFutureListener() { @Override @@ -66,10 +67,12 @@ public void operationComplete(BindFuture future) { if (future.isBound()) { boolean activate = false; synchronized (bindLock) { - if (boundAddresses.isEmpty()) { - activate = true; + synchronized (boundAddresses) { + if (boundAddresses.isEmpty()) { + activate = true; + } + boundAddresses.add(localAddress); } - boundAddresses.add(localAddress); if (activate) { getListeners().fireServiceActivated(); } @@ -90,18 +93,19 @@ public void operationComplete(UnbindFuture future) { if (future.isUnbound()) { boolean deactivate = false; synchronized (bindLock) { - if (boundAddresses.isEmpty()) { - return; - } - boundAddresses.remove(localAddress); - if (boundAddresses.isEmpty()) { - deactivate = true; + synchronized (boundAddresses) { + if (boundAddresses.isEmpty()) { + return; + } + boundAddresses.remove(localAddress); + if (boundAddresses.isEmpty()) { + deactivate = true; + } } if (deactivate) { getListeners().fireServiceDeactivated(); } } - } } }); diff --git a/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/AbstractNioAcceptor.java b/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/AbstractNioAcceptor.java index 5ee6a290ec..51231ea208 100644 --- a/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/AbstractNioAcceptor.java +++ b/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/AbstractNioAcceptor.java @@ -37,6 +37,7 @@ import java.util.Properties; import java.util.SortedSet; import java.util.concurrent.ConcurrentSkipListSet; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.FutureTask; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicBoolean; @@ -333,28 +334,44 @@ public void bind(final ResourceAddress address, failedAddress = currentAddress; } + // Asynchronous bind is needed to avoid a Netty error if bind is called from an IO worker thread. + // This can happens from connect in SocksConnector in reverse mode (see KG-7179 for details). + CountDownLatch countDownLatch = new CountDownLatch(1); if (needsAcceptorBind) { - // Asynchronous bind is needed to avoid a Netty error if bind is called from an IO worker thread. - // This can happens from connect in SocksConnector in reverse mode (see KG-7179 for details). - BindFuture bound = acceptor.bindAsync(socketAddress); - bound.awaitUninterruptibly(); - Throwable e = bound.getException(); - if (e != null) { - boolean preferIPv6Stack = "true".equalsIgnoreCase(System.getProperty("java.net.preferIPv6Stack")); - if (!preferIPv6Stack && (e instanceof SocketException) && (socketAddress.getAddress() instanceof Inet6Address)) { - skipIPv6Addresses = true; - } else { - String error = "Unable to bind resource: " + resource + " cause: " + e.getMessage(); - if (LOG.isDebugEnabled()) { - LOG.debug(error, e); - } else { - LOG.error(error + " "+ e.getMessage()); + // Scheduling onto unbindScheduler thread so that bind and unbind are ordered + if (!unbindScheduler.isShutdown()) { + final ResourceAddress currentBindAddress = currentAddress; + unbindScheduler.submit(new Runnable() { + @Override + public void run() { + try { + acceptor.bind(socketAddress); + boundAuthorities.add(currentBindAddress); + LOG.info("Bound to resource: " + resource); + } catch(Exception e) { + boolean preferIPv6Stack = "true".equalsIgnoreCase(System.getProperty("java.net.preferIPv6Stack")); + if (!preferIPv6Stack && (e instanceof SocketException) && (socketAddress.getAddress() instanceof Inet6Address)) { + skipIPv6Addresses = true; + } else { + String error = "Unable to bind resource: " + resource + " cause: " + e.getMessage(); + if (LOG.isDebugEnabled()) { + LOG.debug(error, e); + } else { + LOG.error(error + " "+ e.getMessage()); + } + throw new RuntimeException(error); + } + } finally { + countDownLatch.countDown(); + } + } - throw new RuntimeException(error); - } - } else { - boundAuthorities.add(currentAddress); - LOG.info("Bound to resource: " + resource); + }); + } + try { + countDownLatch.await(); + } catch (Exception e) { + throw new RuntimeException(e); } } } diff --git a/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioDatagramAcceptorTest.java b/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioDatagramAcceptorTest.java index c903a3ee4a..318aadca78 100644 --- a/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioDatagramAcceptorTest.java +++ b/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioDatagramAcceptorTest.java @@ -31,6 +31,7 @@ import org.kaazing.gateway.resource.address.ResourceAddress; import org.kaazing.gateway.resource.address.ResourceAddressFactory; import org.kaazing.gateway.transport.test.Expectations; +import org.kaazing.gateway.util.scheduler.SchedulerProvider; import org.kaazing.test.util.MethodExecutionTrace; import java.net.DatagramPacket; @@ -66,6 +67,7 @@ public void echo() throws Exception { NioDatagramAcceptor acceptor = new NioDatagramAcceptor(configuration); acceptor.setResourceAddressFactory(newResourceAddressFactory()); acceptor.setTcpAcceptor(tcpAcceptor); + acceptor.setSchedulerProvider(new SchedulerProvider()); acceptor.bind(bindAddress, handler, null); String str = "Hello World"; diff --git a/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioSocketAcceptorTest.java b/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioSocketAcceptorTest.java index fd95c1430f..708927e0b8 100644 --- a/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioSocketAcceptorTest.java +++ b/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioSocketAcceptorTest.java @@ -219,6 +219,7 @@ public void bindAndAcceptShouldInvokeExtensions() throws Exception { configuration.setProperty("maximum.outbound.rate", "10000"); acceptor = new NioSocketAcceptor(configuration, extensionFactory); acceptor.setResourceAddressFactory(newResourceAddressFactory()); + acceptor.setSchedulerProvider(schedulerProvider); final IoSession[] sessions = new IoSession[1]; acceptor.bind(bindAddress, handler, new BridgeSessionInitializer() { @@ -301,6 +302,7 @@ public void bindAndAcceptShouldWorkWhenThereAreNoExtensions() throws Exception { configuration.setProperty("maximum.outbound.rate", "10000"); acceptor = new NioSocketAcceptor(configuration, extensionFactory); acceptor.setResourceAddressFactory(newResourceAddressFactory()); + acceptor.setSchedulerProvider(schedulerProvider); final IoSession[] sessions = new IoSession[1]; acceptor.bind(bindAddress, handler, new BridgeSessionInitializer() { @@ -443,6 +445,7 @@ private void createBindConnectDispose(final boolean writeData) throws Exception ResourceAddressFactory addressFactory = ResourceAddressFactory.newResourceAddressFactory(); acceptor.setResourceAddressFactory(addressFactory); + acceptor.setSchedulerProvider(schedulerProvider); String bindURI = format("tcp://localhost:%d", bindPort); Map opts = new HashMap<>(); opts.put(NEXT_PROTOCOL, "test-protocol"); @@ -537,6 +540,7 @@ public void allWorkersShouldBeUsed_and_reported_by_getWorkerCount_getWorkers() t configuration.setProperty(PROCESSOR_COUNT, Integer.toString(NB_WORKERS)); acceptor = new NioSocketAcceptor(configuration); acceptor.setResourceAddressFactory(newResourceAddressFactory()); + acceptor.setSchedulerProvider(schedulerProvider); final CountDownLatch clientsConnected = new CountDownLatch(NB_WORKERS); ResourceAddressFactory resourceAddressFactory = ResourceAddressFactory.newResourceAddressFactory(); @@ -639,7 +643,7 @@ public void unbindDuringConnect() throws Exception { allowing(mockAcceptor).setHandler(with(aNonNull(IoHandler.class))); will(saveParameter(tcpHandlerHolder, 0)); allowing(mockAcceptor).setSessionDataStructureFactory(with(aNonNull(DefaultIoSessionDataStructureFactory.class))); - allowing(mockAcceptor).bindAsync(with(aNonNull(SocketAddress.class))); + allowing(mockAcceptor).bind(with(aNonNull(SocketAddress.class))); allowing(mockAcceptor).unbind(with(aNonNull(SocketAddress.class))); } public Action saveParameter(final Object[] parameterStorage, final int parameterIndex) { From 104faad8a3e9d6729cf5889304b8864b803101d1 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Tue, 17 Jan 2017 14:50:02 +0200 Subject: [PATCH 30/53] Removed Kaazing's license-maven-plugin references Added test scope to k3po.lang --- NOTICE.txt | 25 -------------------- distribution/src/main/gateway/NOTICE.txt | 25 -------------------- management/pom.xml | 27 ---------------------- mina.core/pom.xml | 8 ------- mina.netty/pom.xml | 29 ------------------------ server/pom.xml | 22 ------------------ service/amqp/pom.xml | 28 ----------------------- service/update.check.management/pom.xml | 27 ---------------------- transport/nio/pom.xml | 1 + 9 files changed, 1 insertion(+), 191 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index fe659ca6aa..b3ed92d113 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -28,16 +28,6 @@ This product depends on Commons IO 2.4 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://commons.apache.org/io/ -This product depends on Java Unified Expression Language API 2.2.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://juel.sourceforge.net/juel-api/ - -This product depends on Java Unified Expression Language Implementation 2.2.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://juel.sourceforge.net/juel-impl/ - This product depends on Netty 3.10.5.Final License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) @@ -73,26 +63,11 @@ This product depends on OGNL - Object Graph Navigation Library 2.7.2 License: http://www.apache.org/licenses/ (Apache License 2) Homepage: http://ognl.org -This product depends on abego TreeLayout Core 1.0.1 - - License: http://treelayout.googlecode.com/files/LICENSE.TXT (BSD 3-Clause "New" or "Revised" License (BSD-3-Clause)) - Homepage: http://code.google.com/p/treelayout/ - This product depends on Agrona 0.9.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache License, Version 2.0) Homepage: https://github.com/real-logic/Agrona -This product depends on ANTLR 4 Runtime Annotations 4.2.2 - - License: http://www.antlr.org/license.html (The BSD License) - Homepage: http://www.antlr.org/antlr4-annotations - -This product depends on ANTLR 4 Runtime 4.2.2 - - License: http://www.antlr.org/license.html (The BSD License) - Homepage: http://www.antlr.org/antlr4-runtime - This product depends on Apache Maven Shared Utils 3.0.0 License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache License, Version 2.0) diff --git a/distribution/src/main/gateway/NOTICE.txt b/distribution/src/main/gateway/NOTICE.txt index fe659ca6aa..b3ed92d113 100644 --- a/distribution/src/main/gateway/NOTICE.txt +++ b/distribution/src/main/gateway/NOTICE.txt @@ -28,16 +28,6 @@ This product depends on Commons IO 2.4 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://commons.apache.org/io/ -This product depends on Java Unified Expression Language API 2.2.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://juel.sourceforge.net/juel-api/ - -This product depends on Java Unified Expression Language Implementation 2.2.7 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) - Homepage: http://juel.sourceforge.net/juel-impl/ - This product depends on Netty 3.10.5.Final License: http://www.apache.org/licenses/LICENSE-2.0 (Apache License, Version 2.0) @@ -73,26 +63,11 @@ This product depends on OGNL - Object Graph Navigation Library 2.7.2 License: http://www.apache.org/licenses/ (Apache License 2) Homepage: http://ognl.org -This product depends on abego TreeLayout Core 1.0.1 - - License: http://treelayout.googlecode.com/files/LICENSE.TXT (BSD 3-Clause "New" or "Revised" License (BSD-3-Clause)) - Homepage: http://code.google.com/p/treelayout/ - This product depends on Agrona 0.9.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache License, Version 2.0) Homepage: https://github.com/real-logic/Agrona -This product depends on ANTLR 4 Runtime Annotations 4.2.2 - - License: http://www.antlr.org/license.html (The BSD License) - Homepage: http://www.antlr.org/antlr4-annotations - -This product depends on ANTLR 4 Runtime 4.2.2 - - License: http://www.antlr.org/license.html (The BSD License) - Homepage: http://www.antlr.org/antlr4-runtime - This product depends on Apache Maven Shared Utils 3.0.0 License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache License, Version 2.0) diff --git a/management/pom.xml b/management/pom.xml index 5ac00edc3c..830fa590ed 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -183,33 +183,6 @@ - - org.kaazing - license-maven-plugin - - - - Java Native Access - LGPL - http://www.gnu.org/licenses/licenses.html - https://github.com/twall/jna - 2.1 - - - JDOM - JDOM License - https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt - http://jdom.org - 1.1 - - - cglib - - 2.0 - - - - org.codehaus.mojo cobertura-maven-plugin diff --git a/mina.core/pom.xml b/mina.core/pom.xml index 26aa0b756a..f2c5744848 100644 --- a/mina.core/pom.xml +++ b/mina.core/pom.xml @@ -63,14 +63,6 @@ - - org.kaazing - license-maven-plugin - - false - false - - maven-surefire-plugin 2.4.3 diff --git a/mina.netty/pom.xml b/mina.netty/pom.xml index 6b6bcbad60..10e753a66b 100644 --- a/mina.netty/pom.xml +++ b/mina.netty/pom.xml @@ -226,35 +226,6 @@ - - org.kaazing - license-maven-plugin - - - - OGNL - Object Graph Navigation Library - Apache 2.0 License - http://www.apache.org/licenses/LICENSE-2.0 - http://ognl.org - 2.0 - - - SLF4J JDK14 Binding - MIT License - http://www.opensource.org/licenses/mit-license.php - http://www.slf4j.org - 1.0 - - - SLF4J API Module - MIT License - http://www.opensource.org/licenses/mit-license.php - http://www.slf4j.org - 1.0 - - - - diff --git a/server/pom.xml b/server/pom.xml index 94b38afd50..9cc39d02be 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -327,28 +327,6 @@ org.apache.maven.plugins maven-failsafe-plugin - - org.kaazing - license-maven-plugin - - - - Java Native Access - LGPL - http://www.gnu.org/licenses/licenses.html - https://github.com/twall/jna - 2.1 - - - JDOM - JDOM License - https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt - http://jdom.org - 1.1 - - - - diff --git a/service/amqp/pom.xml b/service/amqp/pom.xml index 6d7ccd4aac..c4d19d07ea 100644 --- a/service/amqp/pom.xml +++ b/service/amqp/pom.xml @@ -129,34 +129,6 @@ maven-failsafe-plugin - - org.kaazing - license-maven-plugin - - - - - cglib - APACHE 2 - https://github.com/kaazing/gateway.service.amqp/blob/develop/LICENSE.txt - - - JDOM - JDOM License - https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt - http://jdom.org - 1.1 - - - Java Native Access - LGPL - http://www.gnu.org/licenses/licenses.html - https://github.com/twall/jna - 2.1 - - - - diff --git a/service/update.check.management/pom.xml b/service/update.check.management/pom.xml index d8da0695f8..6e239feb49 100644 --- a/service/update.check.management/pom.xml +++ b/service/update.check.management/pom.xml @@ -33,31 +33,4 @@ ${project.version} - - - - - org.kaazing - license-maven-plugin - - - - Java Native Access - LGPL - http://www.gnu.org/licenses/licenses.html - https://github.com/twall/jna - 2.1 - - - JDOM - JDOM License - https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt - http://jdom.org - 1.1 - - - - - - diff --git a/transport/nio/pom.xml b/transport/nio/pom.xml index 0272b234be..f8c8d7a79f 100644 --- a/transport/nio/pom.xml +++ b/transport/nio/pom.xml @@ -67,6 +67,7 @@ org.kaazing k3po.lang ${k3po.version} + test org.kaazing From bce5dadbeffcb49898e4f76b80899ac948426ce2 Mon Sep 17 00:00:00 2001 From: vmaraloiu Date: Tue, 17 Jan 2017 16:29:47 +0200 Subject: [PATCH 31/53] Implemented feedback. --- .../http/proxy/HttpProxyServiceHandler.java | 13 ++- .../http/proxy/HttpProxyLoggingWarnIT.java | 100 ++++++++++++++++++ .../http/proxy/HttpProxyNegativeCasesIT.java | 26 +---- 3 files changed, 114 insertions(+), 25 deletions(-) create mode 100644 service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyLoggingWarnIT.java diff --git a/service/http.proxy/src/main/java/org/kaazing/gateway/service/http/proxy/HttpProxyServiceHandler.java b/service/http.proxy/src/main/java/org/kaazing/gateway/service/http/proxy/HttpProxyServiceHandler.java index e51b7b3439..6a747b4a80 100644 --- a/service/http.proxy/src/main/java/org/kaazing/gateway/service/http/proxy/HttpProxyServiceHandler.java +++ b/service/http.proxy/src/main/java/org/kaazing/gateway/service/http/proxy/HttpProxyServiceHandler.java @@ -108,6 +108,7 @@ class HttpProxyServiceHandler extends AbstractProxyAcceptHandler { private String connectURI; private String useForwarded; + private String serviceName; private int remoteClientPort; private boolean rewriteCookieDomain; private boolean rewriteCookiePath; @@ -122,6 +123,7 @@ public HttpProxyServiceHandler() { void init() { ServiceContext serviceContext = getServiceContext(); + serviceName = serviceContext.getServiceName(); Collection acceptURIs = serviceContext.getAccepts(); Collection connectURIs = serviceContext.getConnects(); @@ -207,9 +209,14 @@ public void sessionOpened(IoSession session) { // final Subject subject = ((IoSessionEx) acceptSession).getSubject(); // log warning first time we see Http 1.0 request - if (acceptSession.getVersion().toString().equals("HTTP/1.0")){ - LOGGER.warn(String.format("http.proxy service %s received an HTTP 1.0 request. HTTP 1.0 is not" - + " explicitly supported.", acceptSession.getService().toString())); + if (acceptSession.getVersion().toString().equals("HTTP/1.0")) { + if (this.serviceName != null) { + LOGGER.warn(String.format( + "http.proxy service %s received an HTTP 1.0 request. HTTP 1.0 is not explicitly supported.", + this.serviceName)); + } else { + LOGGER.warn("http.proxy service received an HTTP 1.0 request. HTTP 1.0 is not explicitly supported."); + } } if (!validateRequestPath(acceptSession)) { diff --git a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyLoggingWarnIT.java b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyLoggingWarnIT.java new file mode 100644 index 0000000000..63d6e52c61 --- /dev/null +++ b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyLoggingWarnIT.java @@ -0,0 +1,100 @@ +/** + * Copyright 2007-2016, Kaazing Corporation. 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. + */ + +package org.kaazing.gateway.service.http.proxy; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.RuleChain; +import org.junit.rules.TestRule; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.model.Statement; +import org.kaazing.gateway.server.test.GatewayRule; +import org.kaazing.gateway.server.test.config.GatewayConfiguration; +import org.kaazing.gateway.server.test.config.builder.GatewayConfigurationBuilder; +import org.kaazing.gateway.util.feature.EarlyAccessFeatures; +import org.kaazing.k3po.junit.annotation.Specification; +import org.kaazing.k3po.junit.rules.K3poRule; +import org.kaazing.test.util.MemoryAppender; +import org.kaazing.test.util.MethodExecutionTrace; + +@RunWith(Parameterized.class) +public class HttpProxyLoggingWarnIT { + + private final K3poRule robot = new K3poRule(); + private List expectedPatterns; + private final String serviceName; + private final String expectedMessage; + + @Parameterized.Parameters + public static Collection data() { + return Arrays.asList(new Object[][]{ + {"TEST", "http.proxy service TEST received an HTTP 1.0 request. HTTP 1.0 is not explicitly supported."}, + {null, "http.proxy service received an HTTP 1.0 request. HTTP 1.0 is not explicitly supported."}}); + } + + public HttpProxyLoggingWarnIT(String serviceName, String expectedMessage) { + this.serviceName = serviceName; + this.expectedMessage = expectedMessage; + this.chain = RuleChain.outerRule(new MethodExecutionTrace()).around(robot).around(checkLogMessageRule).around(getGatewayRule()); + } + + private TestRule checkLogMessageRule = (base, description) -> new Statement() { + @Override + public void evaluate() throws Throwable { + base.evaluate(); + MemoryAppender.assertMessagesLogged(expectedPatterns, null, null, true); + } + }; + + private GatewayRule getGatewayRule() { + return new GatewayRule() { + { + // @formatter:off + GatewayConfiguration configuration = + new GatewayConfigurationBuilder() + .property(EarlyAccessFeatures.HTTP_PROXY_SERVICE.getPropertyName(), "true") + .service() + .name(serviceName) + .accept("http://localhost:8110") + .connect("http://localhost:8080") + .type("http.proxy") + .done() + .done(); + // @formatter:on + init(configuration); + } + }; + } + + @Rule + public TestRule chain; + + @Specification("http.proxy.http.1.0.request") + @Test + public void sendHttp_1_0_Request() throws Exception { + robot.finish(); + expectedPatterns = new ArrayList(Arrays.asList(new String[] { + expectedMessage + })); + } +} diff --git a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyNegativeCasesIT.java b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyNegativeCasesIT.java index b005a1e561..0bcc4991b0 100644 --- a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyNegativeCasesIT.java +++ b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyNegativeCasesIT.java @@ -16,37 +16,23 @@ package org.kaazing.gateway.service.http.proxy; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import org.junit.rules.RuleChain; import org.junit.rules.TestRule; -import org.junit.runners.model.Statement; import org.kaazing.gateway.server.test.GatewayRule; import org.kaazing.gateway.server.test.config.GatewayConfiguration; import org.kaazing.gateway.server.test.config.builder.GatewayConfigurationBuilder; import org.kaazing.gateway.util.feature.EarlyAccessFeatures; import org.kaazing.k3po.junit.annotation.Specification; import org.kaazing.k3po.junit.rules.K3poRule; -import org.kaazing.test.util.MemoryAppender; -import org.kaazing.test.util.MethodExecutionTrace; + + +import static org.kaazing.test.util.ITUtil.createRuleChain; public class HttpProxyNegativeCasesIT { private final K3poRule robot = new K3poRule(); - private List expectedPatterns; - - private TestRule checkLogMessageRule = (base, description) -> new Statement() { - @Override - public void evaluate() throws Throwable { - base.evaluate(); - MemoryAppender.assertMessagesLogged(expectedPatterns, null, null, true); - } - }; private final GatewayRule gateway = new GatewayRule() {{ // @formatter:off @@ -64,16 +50,12 @@ public void evaluate() throws Throwable { }}; @Rule - public TestRule chain = - RuleChain.outerRule(new MethodExecutionTrace()).around(robot).around(checkLogMessageRule).around(gateway); + public TestRule chain = createRuleChain(gateway, robot); @Specification("http.proxy.http.1.0.request") @Test public void sendHttp_1_0_Request() throws Exception { robot.finish(); - expectedPatterns = new ArrayList(Arrays.asList(new String[] { - "http.proxy service .*. received an HTTP 1.0 request. HTTP 1.0 is not explicitly supported." - })); } @Specification("http.proxy.http.2.0.request") From d1b159b622943e4adcde1f128fc2855ab103ab96 Mon Sep 17 00:00:00 2001 From: vstratan Date: Tue, 17 Jan 2017 18:20:06 +0200 Subject: [PATCH 32/53] Removed tests whci are implemented in k3po --- .../http/HttpConnectorFollowRedirectIT.java | 82 ------------------- .../bridge/filter/HttpContentFilterTest.java | 12 +-- 2 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 transport/http/src/test/java/org/kaazing/gateway/transport/http/HttpConnectorFollowRedirectIT.java diff --git a/transport/http/src/test/java/org/kaazing/gateway/transport/http/HttpConnectorFollowRedirectIT.java b/transport/http/src/test/java/org/kaazing/gateway/transport/http/HttpConnectorFollowRedirectIT.java deleted file mode 100644 index 964d23ae20..0000000000 --- a/transport/http/src/test/java/org/kaazing/gateway/transport/http/HttpConnectorFollowRedirectIT.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Copyright 2007-2016, Kaazing Corporation. 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. - */ -package org.kaazing.gateway.transport.http; - -import static org.junit.Assert.assertTrue; -import static org.kaazing.test.util.ITUtil.createRuleChain; - -import java.net.SocketAddress; - -import org.apache.mina.core.future.ConnectFuture; -import org.apache.mina.core.service.IoHandler; -import org.apache.mina.core.session.IoSession; -import org.apache.mina.core.session.IoSessionInitializer; -import org.jmock.Mockery; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestRule; -import org.kaazing.gateway.resource.address.ResourceAddress; -import org.kaazing.k3po.junit.annotation.Specification; -import org.kaazing.k3po.junit.rules.K3poRule; -public class HttpConnectorFollowRedirectIT { - - private final HttpConnectorRule connector = new HttpConnectorRule(); - private final K3poRule k3po = new K3poRule(); - @Rule - public TestRule chain = createRuleChain(connector, k3po); - private Mockery context; - - @Before - public void initialize() { - context = new Mockery(); - } - - @Test - @Specification("should.receive.redirect.response") - public void responseMustBeARedirect() throws Exception { - final IoHandler handler = context.mock(IoHandler.class); - connector.getConnectOptions().put("http.maximum.redirects", 1); - ConnectFuture connectFuture = connector.connect("http://localhost:8080/jms", handler, - new ConnectSessionInitializer()); - connectFuture.awaitUninterruptibly(); - assertTrue(connectFuture.isConnected()); - DefaultHttpSession session = (DefaultHttpSession) connectFuture.getSession(); - SocketAddress localAddressPriorToReconnect = session.getLocalAddress(); - - k3po.finish(); - - SocketAddress localAddressAfterReconnect = session.getLocalAddress(); - Assert.assertNotEquals(localAddressPriorToReconnect, localAddressAfterReconnect); - ResourceAddress remoteAddress = (ResourceAddress) session.getRemoteAddress(); - Assert.assertEquals(8081, remoteAddress.getResource().getPort()); - Assert.assertTrue(session.getUpgradeFuture().getSession().getRemoteAddress().toString().endsWith("8081")); - } - - private static class ConnectSessionInitializer implements IoSessionInitializer { - @Override - public void initializeSession(IoSession session, ConnectFuture future) { - HttpConnectSession connectSession = (HttpConnectSession) session; - connectSession.setMethod(HttpMethod.GET); - connectSession.addWriteHeader("Upgrade", "websocket"); - connectSession.addWriteHeader("Sec-WebSocket-Version" , "13"); - connectSession.addWriteHeader("Sec-WebSocket-Key" , "dGhlIHNhbXBsZSBub25jZQ=="); - connectSession.addWriteHeader("Connection", "Upgrade"); - } - } - -} diff --git a/transport/http/src/test/java/org/kaazing/gateway/transport/http/bridge/filter/HttpContentFilterTest.java b/transport/http/src/test/java/org/kaazing/gateway/transport/http/bridge/filter/HttpContentFilterTest.java index 284ad12fd2..03bc4f9821 100644 --- a/transport/http/src/test/java/org/kaazing/gateway/transport/http/bridge/filter/HttpContentFilterTest.java +++ b/transport/http/src/test/java/org/kaazing/gateway/transport/http/bridge/filter/HttpContentFilterTest.java @@ -51,15 +51,5 @@ public void testWriteGzippedDirectBuffer() throws Exception { assertEquals(actual, expected); } - - @Test - public void testWriteChunked() throws Exception { - IoBufferAllocatorEx allocator = SimpleBufferAllocator.BUFFER_ALLOCATOR; - HttpChunkedEncoder encoder = new HttpChunkedEncoder(); - IoBufferEx buf = allocator.wrap(ByteBuffer.wrap(new byte[] { 0, 1, 2, 3 })); - IoBufferEx actual = encoder.write(buf, allocator); - IoBufferEx expected = allocator.wrap(ByteBuffer.wrap(new byte[] { (byte)'4', '\r', '\n', 0, 1, 2, 3, '\r', '\n' })); - - assertEquals(actual, expected); - } + } From b90ecc58b3989b5ed78288c09b440d41d135b2f3 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Tue, 17 Jan 2017 18:25:10 +0200 Subject: [PATCH 33/53] Changed snmp4j and snmp4j-agent dependencies to be used from org.snmp4j instead of org.kaazing --- NOTICE.txt | 10 ++++++++++ bom/pom.xml | 2 +- distribution/pom.xml | 4 ++-- distribution/src/main/gateway/NOTICE.txt | 10 ++++++++++ management/pom.xml | 8 ++++---- 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index b3ed92d113..5b8c3a3241 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -103,6 +103,16 @@ This product depends on SLF4J LOG4J-12 Binding 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) Homepage: http://www.slf4j.org +This product depends on SNMP4J 1.11.3 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: http://www.snmp4j.org + +This product depends on SNMP4J-Agent 1.4.3 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: http://www.snmp4j.org + This product depends on StAX API 1.0.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) diff --git a/bom/pom.xml b/bom/pom.xml index d0ff23c9c5..db9b9cbf20 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -287,7 +287,7 @@ jdom - org.kaazing + org.snmp4j snmp4j diff --git a/distribution/pom.xml b/distribution/pom.xml index eba8e86c5a..c319b3cf3f 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -63,11 +63,11 @@ gateway.management - org.kaazing + org.snmp4j snmp4j - org.kaazing + org.snmp4j snmp4j-agent diff --git a/distribution/src/main/gateway/NOTICE.txt b/distribution/src/main/gateway/NOTICE.txt index b3ed92d113..5b8c3a3241 100644 --- a/distribution/src/main/gateway/NOTICE.txt +++ b/distribution/src/main/gateway/NOTICE.txt @@ -103,6 +103,16 @@ This product depends on SLF4J LOG4J-12 Binding 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) Homepage: http://www.slf4j.org +This product depends on SNMP4J 1.11.3 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: http://www.snmp4j.org + +This product depends on SNMP4J-Agent 1.4.3 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: http://www.snmp4j.org + This product depends on StAX API 1.0.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) diff --git a/management/pom.xml b/management/pom.xml index 830fa590ed..e78e286480 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -23,12 +23,12 @@ - org.kaazing + org.snmp4j snmp4j 1.11.3 - org.kaazing + org.snmp4j snmp4j-agent 1.4.3 @@ -152,7 +152,7 @@ test - org.kaazing + org.snmp4j snmp4j @@ -160,7 +160,7 @@ Agrona - org.kaazing + org.snmp4j snmp4j-agent From 169adc9350778f7c3c2ed30ae1943ef41e26669e Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Wed, 18 Jan 2017 15:45:57 +0200 Subject: [PATCH 34/53] Revert changes for snmp dependency Add filter for gateway submodules in the maven license plugin configuration --- NOTICE.txt | 20 ++++++++++---------- bom/pom.xml | 2 +- distribution/pom.xml | 6 +++--- distribution/src/main/gateway/NOTICE.txt | 20 ++++++++++---------- management/pom.xml | 8 ++++---- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 5b8c3a3241..ab62b5714d 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -93,6 +93,16 @@ This product depends on JSON (JavaScript Object Notation) 20090211 License: http://www.json.org/license.html (provided without support or warranty) Homepage: http://www.json.org/java/index.html +This product depends on SNMP4J 1.11.3 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: https://github.com/kaazing/snmp4j + +This product depends on SNMP4J-Agent 1.4.3 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: https://github.com/kaazing/snmp4j.agent + This product depends on SLF4J API Module 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) @@ -103,16 +113,6 @@ This product depends on SLF4J LOG4J-12 Binding 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) Homepage: http://www.slf4j.org -This product depends on SNMP4J 1.11.3 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) - Homepage: http://www.snmp4j.org - -This product depends on SNMP4J-Agent 1.4.3 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) - Homepage: http://www.snmp4j.org - This product depends on StAX API 1.0.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) diff --git a/bom/pom.xml b/bom/pom.xml index db9b9cbf20..d0ff23c9c5 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -287,7 +287,7 @@ jdom - org.snmp4j + org.kaazing snmp4j diff --git a/distribution/pom.xml b/distribution/pom.xml index c319b3cf3f..b99c4a14aa 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -63,11 +63,11 @@ gateway.management - org.snmp4j + org.kaazing snmp4j - org.snmp4j + org.kaazing snmp4j-agent @@ -253,7 +253,7 @@ true src/license/THIRD-PARTY.properties true - org.kaazing.* + gateway.*|mina* diff --git a/distribution/src/main/gateway/NOTICE.txt b/distribution/src/main/gateway/NOTICE.txt index 5b8c3a3241..ab62b5714d 100644 --- a/distribution/src/main/gateway/NOTICE.txt +++ b/distribution/src/main/gateway/NOTICE.txt @@ -93,6 +93,16 @@ This product depends on JSON (JavaScript Object Notation) 20090211 License: http://www.json.org/license.html (provided without support or warranty) Homepage: http://www.json.org/java/index.html +This product depends on SNMP4J 1.11.3 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: https://github.com/kaazing/snmp4j + +This product depends on SNMP4J-Agent 1.4.3 + + License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) + Homepage: https://github.com/kaazing/snmp4j.agent + This product depends on SLF4J API Module 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) @@ -103,16 +113,6 @@ This product depends on SLF4J LOG4J-12 Binding 1.7.21 License: http://www.opensource.org/licenses/mit-license.php (MIT License) Homepage: http://www.slf4j.org -This product depends on SNMP4J 1.11.3 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) - Homepage: http://www.snmp4j.org - -This product depends on SNMP4J-Agent 1.4.3 - - License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) - Homepage: http://www.snmp4j.org - This product depends on StAX API 1.0.1 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) diff --git a/management/pom.xml b/management/pom.xml index e78e286480..830fa590ed 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -23,12 +23,12 @@ - org.snmp4j + org.kaazing snmp4j 1.11.3 - org.snmp4j + org.kaazing snmp4j-agent 1.4.3 @@ -152,7 +152,7 @@ test - org.snmp4j + org.kaazing snmp4j @@ -160,7 +160,7 @@ Agrona - org.snmp4j + org.kaazing snmp4j-agent From 7d49bd37dc6dd2edb501f9d2a78217ed999a1c01 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Wed, 18 Jan 2017 17:47:59 +0200 Subject: [PATCH 35/53] Removed windows service package from gateway server Set junit dependency scope to provided --- .../windowsservice/ExtendedAdvapi32.java | 102 ------------------ .../server/windowsservice/ISimpleService.java | 27 ----- .../windowsservice/SERVICE_MAIN_FUNCTION.java | 35 ------ .../SimpleServiceControlHandler.java | 59 ---------- .../windowsservice/SimpleServiceMain.java | 73 ------------- .../windowsservice/SimpleServiceManager.java | 40 ------- .../server/windowsservice/WindowsService.java | 41 ------- transport/spi/pom.xml | 2 +- 8 files changed, 1 insertion(+), 378 deletions(-) delete mode 100644 server/src/main/java/org/kaazing/gateway/server/windowsservice/ExtendedAdvapi32.java delete mode 100644 server/src/main/java/org/kaazing/gateway/server/windowsservice/ISimpleService.java delete mode 100644 server/src/main/java/org/kaazing/gateway/server/windowsservice/SERVICE_MAIN_FUNCTION.java delete mode 100644 server/src/main/java/org/kaazing/gateway/server/windowsservice/SimpleServiceControlHandler.java delete mode 100644 server/src/main/java/org/kaazing/gateway/server/windowsservice/SimpleServiceMain.java delete mode 100644 server/src/main/java/org/kaazing/gateway/server/windowsservice/SimpleServiceManager.java delete mode 100644 server/src/main/java/org/kaazing/gateway/server/windowsservice/WindowsService.java diff --git a/server/src/main/java/org/kaazing/gateway/server/windowsservice/ExtendedAdvapi32.java b/server/src/main/java/org/kaazing/gateway/server/windowsservice/ExtendedAdvapi32.java deleted file mode 100644 index 2f10b9d608..0000000000 --- a/server/src/main/java/org/kaazing/gateway/server/windowsservice/ExtendedAdvapi32.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * Copyright 2007-2016, Kaazing Corporation. 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. - */ -package org.kaazing.gateway.server.windowsservice; - -import com.sun.jna.Native; -import com.sun.jna.Pointer; -import com.sun.jna.Structure; -import com.sun.jna.platform.win32.Advapi32; -import com.sun.jna.platform.win32.W32Errors; -import com.sun.jna.platform.win32.WinNT.HANDLE; -import com.sun.jna.win32.W32APIOptions; - -/** - * Based on the blog post http://enigma2eureka.blogspot.com/2011/05/writing-windows-service-in-java.html, with adjustments for - * calls Kaazing makes beyond those described in the article. - */ -public interface ExtendedAdvapi32 extends Advapi32 { - ExtendedAdvapi32 INSTANCE = - (ExtendedAdvapi32) Native.loadLibrary("Advapi32", - ExtendedAdvapi32.class, - W32APIOptions.UNICODE_OPTIONS); - - class SERVICE_TABLE_ENTRY extends Structure { - public String serviceName; - public SERVICE_MAIN_FUNCTION serviceProc; - } - - boolean StartServiceCtrlDispatcher(SERVICE_TABLE_ENTRY[] lpServiceTable); - - interface HandlerEx extends StdCallCallback { - int serviceControlHandler(int serviceControlCode, - int eventType, - Pointer eventData, - Pointer context); - } - - class SERVICE_STATUS_HANDLE extends HANDLE { - public SERVICE_STATUS_HANDLE() { - } - - public SERVICE_STATUS_HANDLE(Pointer p) { - super(p); - } - } - - SERVICE_STATUS_HANDLE RegisterServiceCtrlHandlerEx(String serviceName, - HandlerEx handler, - Object context); - - class SERVICE_STATUS extends Structure { - public int serviceType = SERVICE_WIN32_OWN_PROCESS; - public int currentState; - public int controlsAccepted; - public int win32ExitCode = W32Errors.NO_ERROR; - public int serviceSpecificExitCode; - public int checkPoint; - public int waitHint; - } - - boolean SetServiceStatus(SERVICE_STATUS_HANDLE serviceStatusHandle, - SERVICE_STATUS serviceStatus); - - // Codes used/returned by the SERVICE_STATUS structure. - int SERVICE_WIN32_OWN_PROCESS = 0x00000010; - - // declare the Windows current-state codes (ServiceStatus.dwCurrentState) - int SERVICE_CONTINUE_PENDING = 0x00000005; - int SERVICE_PAUSE_PENDING = 0x00000006; - int SERVICE_PAUSED = 0x00000007; - int SERVICE_RUNNING = 0x00000004; - int SERVICE_START_PENDNG = 0x00000002; // the service is starting - int SERVICE_STOP_PENDING = 0x00000003; - int SERVICE_STOPPED = 0x00000001; // is it really same as SERVICE_ACCEPT_STOP? - - // declare the controls accepted (dwControlsAccepted) - int SERVICE_ACCEPT_NETBINDCHNAGE = 0x00000010; - int SERVICE_ACCEPT_PARAMCHANGE = 0x00000008; - int SERVICE_ACCEPT_PAUSE_CONTINUE = 0x00000002; // can be paused and continued - int SERVICE_ACCEPT_PRESHUTDOWN = 0x00000100; - int SERVICE_ACCEPT_SHUTDOWN = 0x00000004; // is it really same as SERVICE_RUNNING? - int SERVICE_ACCEPT_STOP = 0x00000001; - - int SERVICE_CONTROL_SHUTDOWN = 0x00000005; // Code sent by the system when SERVICE_ACCEPT_SHUTDOWN is set.) - int SERVICE_CONTROL_STOP = 0x00000001; // Code to send to the service when it has SERVICE_ACCEPT_STOP. - - // Must return NO_ERROR for this, not ERROR_CALL_NOT_IMPLEMENTED - int SERVICE_CONTROL_INTERROGATE = 0x00000004; - -} diff --git a/server/src/main/java/org/kaazing/gateway/server/windowsservice/ISimpleService.java b/server/src/main/java/org/kaazing/gateway/server/windowsservice/ISimpleService.java deleted file mode 100644 index 9fca167367..0000000000 --- a/server/src/main/java/org/kaazing/gateway/server/windowsservice/ISimpleService.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright 2007-2016, Kaazing Corporation. 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. - */ -package org.kaazing.gateway.server.windowsservice; - -/** - * Part of JNA-based Windows Service program, based on the example I found in http://enigma2eureka.blogspot - * .com/2011/05/writing-windows-service-in-java.html - * and my own C++-based service work from earlier in 3.2 and 3.3. - */ -public interface ISimpleService { - int run(String[] args); - - void stop(); -} diff --git a/server/src/main/java/org/kaazing/gateway/server/windowsservice/SERVICE_MAIN_FUNCTION.java b/server/src/main/java/org/kaazing/gateway/server/windowsservice/SERVICE_MAIN_FUNCTION.java deleted file mode 100644 index a7ebe194d2..0000000000 --- a/server/src/main/java/org/kaazing/gateway/server/windowsservice/SERVICE_MAIN_FUNCTION.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright 2007-2016, Kaazing Corporation. 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. - */ -package org.kaazing.gateway.server.windowsservice; - -import com.sun.jna.Pointer; -import com.sun.jna.win32.StdCallLibrary.StdCallCallback; - -/** - * Part of JNA-based Windows Service program, based on the example I found in http://enigma2eureka.blogspot - * .com/2011/05/writing-windows-service-in-java.html - * and my own C++-based service work from earlier in 3.2 and 3.3. - */ -public interface SERVICE_MAIN_FUNCTION extends StdCallCallback { - /** - * ServiceMain is the main method of the service. It should return only once the service is stopped. - * - * @param dwArgc - * @param argv A pointer to an array (of length dwArgc) of pointers to strings. - */ - void ServiceMain(int dwArgc, Pointer argv); - -} diff --git a/server/src/main/java/org/kaazing/gateway/server/windowsservice/SimpleServiceControlHandler.java b/server/src/main/java/org/kaazing/gateway/server/windowsservice/SimpleServiceControlHandler.java deleted file mode 100644 index e76f9d60c8..0000000000 --- a/server/src/main/java/org/kaazing/gateway/server/windowsservice/SimpleServiceControlHandler.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Copyright 2007-2016, Kaazing Corporation. 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. - */ -package org.kaazing.gateway.server.windowsservice; - -import com.sun.jna.Pointer; -import com.sun.jna.platform.win32.W32Errors; -import org.kaazing.gateway.server.windowsservice.ExtendedAdvapi32.HandlerEx; - -/** - * Part of JNA-based Windows Service program, based on the example I found in http://enigma2eureka.blogspot - * .com/2011/05/writing-windows-service-in-java.html - * and my own C++-based service work from earlier in 3.2 and 3.3. - */ -class SimpleServiceControlHandler implements HandlerEx { - private final ISimpleService service; - - /** - * Constructor. - * - * @param service - */ - public SimpleServiceControlHandler(ISimpleService service) { - this.service = service; - } - - /** - * @see org.kaazing.gateway.server.windowsservice.ExtendedAdvapi32. - * HandlerEx#serviceControlHandler(int, int, com.sun.jna.Pointer, com.sun.jna.Pointer) - */ - @Override - public int serviceControlHandler(int serviceControlCode, - int eventType, - Pointer eventData, - Pointer context) { - switch (serviceControlCode) { - case ExtendedAdvapi32.SERVICE_CONTROL_INTERROGATE: - return W32Errors.NO_ERROR; - case ExtendedAdvapi32.SERVICE_CONTROL_STOP: - service.stop(); - return W32Errors.NO_ERROR; - default: - return W32Errors.ERROR_CALL_NOT_IMPLEMENTED; - } - } - -} diff --git a/server/src/main/java/org/kaazing/gateway/server/windowsservice/SimpleServiceMain.java b/server/src/main/java/org/kaazing/gateway/server/windowsservice/SimpleServiceMain.java deleted file mode 100644 index 9066f0f55e..0000000000 --- a/server/src/main/java/org/kaazing/gateway/server/windowsservice/SimpleServiceMain.java +++ /dev/null @@ -1,73 +0,0 @@ -/** - * Copyright 2007-2016, Kaazing Corporation. 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. - */ -package org.kaazing.gateway.server.windowsservice; - -import com.sun.jna.Pointer; -import java.util.Arrays; -import org.kaazing.gateway.server.windowsservice.ExtendedAdvapi32.SERVICE_STATUS; -import org.kaazing.gateway.server.windowsservice.ExtendedAdvapi32.SERVICE_STATUS_HANDLE; - -/** - * Part of JNA-based Windows Service program, based on the example I found in http://enigma2eureka.blogspot - * .com/2011/05/writing-windows-service-in-java.html - * and my own C++-based service work from earlier in 3.2 and 3.3. - */ -class SimpleServiceMain implements SERVICE_MAIN_FUNCTION { - private final ISimpleService simpleService; - private final SimpleServiceControlHandler handler; - private SERVICE_STATUS_HANDLE serviceStatusHandle; - - /** - * Constructor. - * - * @param simpleService - * @param handler - */ - public SimpleServiceMain(ISimpleService simpleService, - SimpleServiceControlHandler handler) { - this.simpleService = simpleService; - this.handler = handler; - } - - @Override - public void ServiceMain(int argc, Pointer argv) { - if (argc < 1 || argv == null) { - // Missing the service name. - return; - } - - try { - String[] args = argv.getStringArray(0, argc, true); - String serviceName = args[0]; - String[] startParameters = Arrays.copyOfRange(args, 1, args.length); - serviceStatusHandle = - ExtendedAdvapi32.INSTANCE.RegisterServiceCtrlHandlerEx(serviceName, handler, null); - setServiceStatus(ExtendedAdvapi32.SERVICE_RUNNING, - ExtendedAdvapi32.SERVICE_ACCEPT_STOP | - ExtendedAdvapi32.SERVICE_ACCEPT_SHUTDOWN); - simpleService.run(startParameters); - } finally { - setServiceStatus(ExtendedAdvapi32.SERVICE_STOPPED, 0); - } - } - - private void setServiceStatus(int currentState, int controlsAccepted) { - SERVICE_STATUS serviceStatus = new SERVICE_STATUS(); - serviceStatus.currentState = currentState; - serviceStatus.controlsAccepted = controlsAccepted; - ExtendedAdvapi32.INSTANCE.SetServiceStatus(serviceStatusHandle, serviceStatus); - } -} diff --git a/server/src/main/java/org/kaazing/gateway/server/windowsservice/SimpleServiceManager.java b/server/src/main/java/org/kaazing/gateway/server/windowsservice/SimpleServiceManager.java deleted file mode 100644 index 846d884705..0000000000 --- a/server/src/main/java/org/kaazing/gateway/server/windowsservice/SimpleServiceManager.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2007-2016, Kaazing Corporation. 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. - */ -package org.kaazing.gateway.server.windowsservice; - -import org.kaazing.gateway.server.windowsservice.ExtendedAdvapi32.SERVICE_TABLE_ENTRY; - -/** - * Part of JNA-based Windows Service program, based on the example I found in http://enigma2eureka.blogspot - * .com/2011/05/writing-windows-service-in-java.html - * and my own C++-based service work from earlier in 3.2 and 3.3. - */ -public final class SimpleServiceManager { - - private SimpleServiceManager() { - } - - public static void runSimpleService(ISimpleService service) { - SimpleServiceControlHandler handler = new SimpleServiceControlHandler(service); - SimpleServiceMain serviceMain = new SimpleServiceMain(service, handler); - SERVICE_TABLE_ENTRY entry = new SERVICE_TABLE_ENTRY(); - entry.serviceName = ""; // Should we fix this? - entry.serviceProc = serviceMain; - SERVICE_TABLE_ENTRY[] serviceTable = - (SERVICE_TABLE_ENTRY[]) entry.toArray(2); - ExtendedAdvapi32.INSTANCE.StartServiceCtrlDispatcher(serviceTable); - } -} diff --git a/server/src/main/java/org/kaazing/gateway/server/windowsservice/WindowsService.java b/server/src/main/java/org/kaazing/gateway/server/windowsservice/WindowsService.java deleted file mode 100644 index dcf8e4b0c1..0000000000 --- a/server/src/main/java/org/kaazing/gateway/server/windowsservice/WindowsService.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Copyright 2007-2016, Kaazing Corporation. 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. - */ -package org.kaazing.gateway.server.windowsservice; - - -/** - * JNA-based Windows Service program, based on the example I found in http://enigma2eureka.blogspot - * .com/2011/05/writing-windows-service-in-java.html - * and my own C++-based service work from earlier in 3.2 and 3.3. - *

- * NOTE: if it isn't already obvious, this WindowsService is NOT related in any way to the Kaazing 'service' objects, which - * implement Kaazing services within the Gateway. - */ -public class WindowsService implements ISimpleService { - - @Override - public int run(String[] args) { - return 0; // XXX FIX THIS!!! - } - - @Override - public void stop() { - } - - public static void main(String[] args) { - SimpleServiceManager.runSimpleService(new WindowsService()); - } -} diff --git a/transport/spi/pom.xml b/transport/spi/pom.xml index 0d4c694176..5c0b9d0195 100644 --- a/transport/spi/pom.xml +++ b/transport/spi/pom.xml @@ -76,7 +76,7 @@ junit junit - compile + provided org.jmock From a5c1e15c4ef888675738324e16069ee82f763a62 Mon Sep 17 00:00:00 2001 From: Marina Gherghe Date: Thu, 19 Jan 2017 12:34:02 +0200 Subject: [PATCH 36/53] Updated Notice.txt files after synchronizing with upstream Removed unused jna dependencies from gateway.server --- NOTICE.txt | 15 --------------- distribution/src/license/THIRD-PARTY.properties | 10 ++-------- distribution/src/main/gateway/NOTICE.txt | 15 --------------- server/pom.xml | 13 ------------- 4 files changed, 2 insertions(+), 51 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index ab62b5714d..f77fcade13 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -38,21 +38,11 @@ This product depends on Javassist 3.7.ga License: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/jboss/javassist/License.html?rev=HEAD&content-type=text/html (MPL 1.1) Homepage: http://labs.jboss.com/javassist/ -This product depends on JUnit 4.12 - - License: http://www.eclipse.org/legal/epl-v10.html (Eclipse Public License 1.0) - Homepage: http://junit.org - This product depends on Apache Log4j 1.2.17 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://logging.apache.org/log4j/1.2/ -This product depends on Java Native Access 3.3.0 - - License: http://www.gnu.org/licenses/licenses.html (LGPL) - The project URL is not included in this dependency's pom, and thus could not be referenced here. - This product depends on opencsv 2.3 License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) @@ -78,11 +68,6 @@ This product depends on XmlBeans 2.4.0 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://xmlbeans.apache.org -This product depends on Hamcrest Core 1.3 - - License: http://www.opensource.org/licenses/bsd-license.php (New BSD License) - Homepage: https://github.com/hamcrest/JavaHamcrest/hamcrest-core - This product depends on JDOM 1.1 License: https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt (JDOM License) diff --git a/distribution/src/license/THIRD-PARTY.properties b/distribution/src/license/THIRD-PARTY.properties index f2401f489e..7873687a09 100644 --- a/distribution/src/license/THIRD-PARTY.properties +++ b/distribution/src/license/THIRD-PARTY.properties @@ -2,24 +2,18 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2 -# - Apache 2.0 License # - Apache License, Version 2.0 -# - BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) -# - Eclipse Public License 1.0 # - MIT License # - MPL 1.1 -# - New BSD License # - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 -# - The BSD License -# - http://www.gnu.org/licenses/licenses.html (LGPL) +# - http://www.apache.org/licenses/ (Apache License 2) # - https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt (JDOM License) # - provided without support or warranty #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Dec 13 15:38:06 EET 2016 -net.java.dev.jna--jna--3.3.0=http\://www.gnu.org/licenses/licenses.html (LGPL) +#Thu Jan 19 12:26:31 EET 2017 ognl--ognl--2.7.2=http\://www.apache.org/licenses/ (Apache License 2) org.jdom--jdom--1.1=https\://github.com/hunterhacker/jdom/blob/master/LICENSE.txt (JDOM License) diff --git a/distribution/src/main/gateway/NOTICE.txt b/distribution/src/main/gateway/NOTICE.txt index ab62b5714d..f77fcade13 100644 --- a/distribution/src/main/gateway/NOTICE.txt +++ b/distribution/src/main/gateway/NOTICE.txt @@ -38,21 +38,11 @@ This product depends on Javassist 3.7.ga License: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/jboss/javassist/License.html?rev=HEAD&content-type=text/html (MPL 1.1) Homepage: http://labs.jboss.com/javassist/ -This product depends on JUnit 4.12 - - License: http://www.eclipse.org/legal/epl-v10.html (Eclipse Public License 1.0) - Homepage: http://junit.org - This product depends on Apache Log4j 1.2.17 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://logging.apache.org/log4j/1.2/ -This product depends on Java Native Access 3.3.0 - - License: http://www.gnu.org/licenses/licenses.html (LGPL) - The project URL is not included in this dependency's pom, and thus could not be referenced here. - This product depends on opencsv 2.3 License: http://www.apache.org/licenses/LICENSE-2.0.txt (Apache 2) @@ -78,11 +68,6 @@ This product depends on XmlBeans 2.4.0 License: http://www.apache.org/licenses/LICENSE-2.0.txt (The Apache Software License, Version 2.0) Homepage: http://xmlbeans.apache.org -This product depends on Hamcrest Core 1.3 - - License: http://www.opensource.org/licenses/bsd-license.php (New BSD License) - Homepage: https://github.com/hamcrest/JavaHamcrest/hamcrest-core - This product depends on JDOM 1.1 License: https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt (JDOM License) diff --git a/server/pom.xml b/server/pom.xml index 9cc39d02be..8b32def620 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -176,18 +176,6 @@ jdom - - net.java.dev.jna - jna - ${jna.version} - - - net.java.dev.jna - jna - platform - ${jna.version} - - commons-cli @@ -391,7 +379,6 @@ - 3.3.0 1.2 org/kaazing/code/quality/checkstyle.xml From 60e88a86a8ae4ad9d4e5d0515987522bec1b07d5 Mon Sep 17 00:00:00 2001 From: Jitendra Kotamraju Date: Thu, 19 Jan 2017 17:50:01 -0800 Subject: [PATCH 37/53] Fixing the race where future[0] may not be set when k3po.finish() is (#853) done. --- .../gateway/transport/udp/specification/UdpConnectorIT.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/transport/nio/src/test/java/org/kaazing/gateway/transport/udp/specification/UdpConnectorIT.java b/transport/nio/src/test/java/org/kaazing/gateway/transport/udp/specification/UdpConnectorIT.java index 6f40f23e5e..ca3dad2f33 100644 --- a/transport/nio/src/test/java/org/kaazing/gateway/transport/udp/specification/UdpConnectorIT.java +++ b/transport/nio/src/test/java/org/kaazing/gateway/transport/udp/specification/UdpConnectorIT.java @@ -127,6 +127,7 @@ protected void doMessageReceived(IoSessionEx session, Object message) { @Test @Specification("client.sent.data/server") public void clientSentData() throws Exception { + CountDownLatch latch = new CountDownLatch(1); k3po.start(); k3po.awaitBarrier("BOUND"); WriteFuture[] futures = new WriteFuture[1]; @@ -135,10 +136,12 @@ public void clientSentData() throws Exception { protected void doSessionOpened(IoSessionEx session) { WriteFuture future = writeStringMessageToSession("client data", session); futures[0] = future; + latch.countDown(); } }); k3po.finish(); + latch.await(5, TimeUnit.SECONDS); // since k3po may finish early futures[0].await(2, SECONDS); assertTrue(futures[0].isWritten()); } From 8351ac8d0fdc4c7ce10fb64aabc2be5ab2868ddf Mon Sep 17 00:00:00 2001 From: Raluca Stanculescu Date: Fri, 20 Jan 2017 20:35:59 +0200 Subject: [PATCH 38/53] Fix the diagnostic messages from ExceptionMonitor for unexpected exception to include session details (#836) Added a Kaazing version of ExceptionMonitor to mina.netty which adds a session parameter to method exceptionCaught. Set the (static) exception monitor in TransportFactory to an implementation that will include session details (including client identity) in the log message. Altered all code which calls the ExceptionMonitor to use the new version and pass in the session. --- mina.netty/pom.xml | 6 - .../mina/core/future/DefaultIoFutureEx.java | 4 +- .../mina/core/service/AbstractIoService.java | 4 +- .../mina/netty/ChannelIoProcessor.java | 6 +- .../nio/NioSocketChannelIoAcceptor.java | 2 +- .../nio/NioSocketChannelIoConnector.java | 2 +- .../mina/util/DefaultExceptionMonitor.java | 44 +++++ .../kaazing/mina/util/ExceptionMonitor.java | 61 +++++++ .../netty/DefaultExceptionMonitorTest.java | 70 ++++++++ .../mina/netty/ExceptionMonitorTest.java | 47 ++++++ ...ltNioSocketChannelIoSessionConfigTest.java | 3 + .../nio/NioSocketChannelIoAcceptorTest.java | 50 ++++++ .../nio/NioSocketChannelIoConnectorTest.java | 47 ++++++ .../transport/bio/MulticastAcceptorImpl.java | 4 +- .../transport/bio/MulticastConnectorImpl.java | 4 +- .../specification/TcpConnectorLoggingIT.java | 150 ++++++++++++++++++ .../transport/AbstractBridgeService.java | 8 +- .../gateway/transport/LoggingUtils.java | 26 ++- .../transport/TransportExceptionMonitor.java | 42 +++++ .../gateway/transport/TransportFactory.java | 6 + .../TransportExceptionMonitorTest.java | 98 ++++++++++++ 21 files changed, 657 insertions(+), 27 deletions(-) create mode 100644 mina.netty/src/main/java/org/kaazing/mina/util/DefaultExceptionMonitor.java create mode 100644 mina.netty/src/main/java/org/kaazing/mina/util/ExceptionMonitor.java create mode 100644 mina.netty/src/test/java/org/kaazing/mina/netty/DefaultExceptionMonitorTest.java create mode 100644 mina.netty/src/test/java/org/kaazing/mina/netty/ExceptionMonitorTest.java create mode 100644 mina.netty/src/test/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoAcceptorTest.java create mode 100644 mina.netty/src/test/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoConnectorTest.java create mode 100644 transport/nio/src/test/java/org/kaazing/gateway/transport/tcp/specification/TcpConnectorLoggingIT.java create mode 100644 transport/spi/src/main/java/org/kaazing/gateway/transport/TransportExceptionMonitor.java create mode 100644 transport/spi/src/test/java/org/kaazing/gateway/transport/TransportExceptionMonitorTest.java diff --git a/mina.netty/pom.xml b/mina.netty/pom.xml index cc49109daa..840304f0a4 100644 --- a/mina.netty/pom.xml +++ b/mina.netty/pom.xml @@ -65,11 +65,6 @@ - - org.slf4j - slf4j-jdk14 - provided - org.agrona Agrona @@ -270,7 +265,6 @@ org/kaazing/code/quality/checkstyle.xml UTF-8 - true diff --git a/mina.netty/src/main/java/org/kaazing/mina/core/future/DefaultIoFutureEx.java b/mina.netty/src/main/java/org/kaazing/mina/core/future/DefaultIoFutureEx.java index 363751ae5e..17761d52de 100644 --- a/mina.netty/src/main/java/org/kaazing/mina/core/future/DefaultIoFutureEx.java +++ b/mina.netty/src/main/java/org/kaazing/mina/core/future/DefaultIoFutureEx.java @@ -29,7 +29,7 @@ import org.apache.mina.core.polling.AbstractPollingIoProcessor; import org.apache.mina.core.service.IoProcessor; import org.apache.mina.core.session.IoSession; -import org.apache.mina.util.ExceptionMonitor; +import org.kaazing.mina.util.ExceptionMonitor; /** @@ -422,7 +422,7 @@ private void notifyListener(IoFutureListener l) { try { l.operationComplete(this); } catch (Throwable t) { - ExceptionMonitor.getInstance().exceptionCaught(t); + ExceptionMonitor.getInstance().exceptionCaught(t, this.session); } } } diff --git a/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoService.java b/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoService.java index edd2c8ee63..1f41933ebc 100644 --- a/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoService.java +++ b/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoService.java @@ -45,11 +45,11 @@ import org.apache.mina.core.session.IoSessionDataStructureFactory; import org.apache.mina.core.session.IoSessionInitializationException; import org.apache.mina.core.session.IoSessionInitializer; -import org.apache.mina.util.ExceptionMonitor; import org.apache.mina.util.NamePreservingRunnable; import org.kaazing.mina.core.filterchain.DefaultIoFilterChain; import org.kaazing.mina.core.session.AbstractIoSession; +import org.kaazing.mina.util.ExceptionMonitor; /** * Base implementation of {@link IoService}s. @@ -306,7 +306,7 @@ public final void dispose() { try { this.disposalFuture = disposalFuture = dispose0(); } catch (Exception e) { - ExceptionMonitor.getInstance().exceptionCaught(e); + ExceptionMonitor.getInstance().exceptionCaught(e, this.disposalFuture.getSession()); } finally { if (disposalFuture == null) { disposed = true; diff --git a/mina.netty/src/main/java/org/kaazing/mina/netty/ChannelIoProcessor.java b/mina.netty/src/main/java/org/kaazing/mina/netty/ChannelIoProcessor.java index 5bd1e91c77..6a7f5a4ee6 100644 --- a/mina.netty/src/main/java/org/kaazing/mina/netty/ChannelIoProcessor.java +++ b/mina.netty/src/main/java/org/kaazing/mina/netty/ChannelIoProcessor.java @@ -32,7 +32,6 @@ import org.apache.mina.core.write.WriteRequest; import org.apache.mina.core.write.WriteRequestQueue; import org.apache.mina.core.write.WriteToClosedSessionException; -import org.apache.mina.util.ExceptionMonitor; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelConfig; import org.jboss.netty.channel.ChannelFuture; @@ -43,6 +42,7 @@ import org.kaazing.mina.netty.ChannelIoBufferAllocator.ChannelIoBuffer; import org.kaazing.mina.netty.channel.DownstreamMessageEventEx; import org.kaazing.mina.netty.util.threadlocal.VicariousThreadLocal; +import org.kaazing.mina.util.ExceptionMonitor; /** * Since this class is stateless it is a singleton within each consuming service (to avoid static state) @@ -131,12 +131,12 @@ private void addNow(ChannelIoSession session) { IoServiceListenerSupport listeners = session.getService().getListeners(); listeners.fireSessionCreated(session); } catch (Throwable e) { - ExceptionMonitor.getInstance().exceptionCaught(e); + ExceptionMonitor.getInstance().exceptionCaught(e, session); try { destroy(session); } catch (Exception e1) { - ExceptionMonitor.getInstance().exceptionCaught(e1); + ExceptionMonitor.getInstance().exceptionCaught(e1, session); } } } diff --git a/mina.netty/src/main/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoAcceptor.java b/mina.netty/src/main/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoAcceptor.java index 5cefc765a4..74f82f2883 100644 --- a/mina.netty/src/main/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoAcceptor.java +++ b/mina.netty/src/main/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoAcceptor.java @@ -34,7 +34,7 @@ public class NioSocketChannelIoAcceptor extends SocketChannelIoAcceptor { private static final TransportMetadata NIO_SOCKET_TRANSPORT_METADATA = new DefaultTransportMetadata( - "Kaazing", "NioSocketChannel", false, true, InetSocketAddress.class, + "Kaazing", "tcp", false, true, InetSocketAddress.class, SocketSessionConfig.class, Object.class); public NioSocketChannelIoAcceptor(NioSocketChannelIoSessionConfig sessionConfig) { diff --git a/mina.netty/src/main/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoConnector.java b/mina.netty/src/main/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoConnector.java index fcbc434edd..8191156548 100644 --- a/mina.netty/src/main/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoConnector.java +++ b/mina.netty/src/main/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoConnector.java @@ -32,7 +32,7 @@ public class NioSocketChannelIoConnector extends SocketChannelIoConnector { private static final TransportMetadata NIO_SOCKET_TRANSPORT_METADATA = new DefaultTransportMetadata( - "Kaazing", "NioSocketChannel", false, true, InetSocketAddress.class, + "Kaazing", "tcp", false, true, InetSocketAddress.class, SocketSessionConfig.class, Object.class); public NioSocketChannelIoConnector(NioSocketChannelIoSessionConfig sessionConfig) { diff --git a/mina.netty/src/main/java/org/kaazing/mina/util/DefaultExceptionMonitor.java b/mina.netty/src/main/java/org/kaazing/mina/util/DefaultExceptionMonitor.java new file mode 100644 index 0000000000..a995311dc3 --- /dev/null +++ b/mina.netty/src/main/java/org/kaazing/mina/util/DefaultExceptionMonitor.java @@ -0,0 +1,44 @@ +/** + * Copyright 2007-2016, Kaazing Corporation. 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. + */ +package org.kaazing.mina.util; + +import org.apache.mina.core.service.IoService; +import org.apache.mina.core.session.IoSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A default {@link ExceptionMonitor} implementation that logs uncaught + * exceptions using {@link Logger}. + *

+ * All {@link IoService}s have this implementation as a default exception + * monitor. + * + * @author Apache MINA Project + */ +public class DefaultExceptionMonitor extends ExceptionMonitor { + private static final Logger LOGGER = LoggerFactory + .getLogger(DefaultExceptionMonitor.class); + + @Override + public void exceptionCaught(Throwable cause, IoSession s) { + if (cause instanceof Error) { + throw (Error) cause; + } + + LOGGER.warn("Unexpected exception in session {}", s, cause); + } +} diff --git a/mina.netty/src/main/java/org/kaazing/mina/util/ExceptionMonitor.java b/mina.netty/src/main/java/org/kaazing/mina/util/ExceptionMonitor.java new file mode 100644 index 0000000000..395fef6929 --- /dev/null +++ b/mina.netty/src/main/java/org/kaazing/mina/util/ExceptionMonitor.java @@ -0,0 +1,61 @@ +/** + * Copyright 2007-2016, Kaazing Corporation. 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. + */ +package org.kaazing.mina.util; + +import org.apache.mina.core.session.IoSession; + +/** + * Monitors uncaught exceptions. {@link #exceptionCaught(Throwable)} is + * invoked when there are any uncaught exceptions. + *

+ * You can monitor any uncaught exceptions by setting {@link ExceptionMonitor} + * by calling {@link #setInstance(ExceptionMonitor)}. The default + * monitor logs all caught exceptions in WARN level using + * SLF4J. + * + * @author Apache MINA Project + * + * @see DefaultExceptionMonitor + */ +public abstract class ExceptionMonitor { + private static ExceptionMonitor instance = new DefaultExceptionMonitor(); + + /** + * Returns the current exception monitor. + */ + public static ExceptionMonitor getInstance() { + return instance; + } + + /** + * Sets the uncaught exception monitor. If null is specified, + * the default monitor will be set. + * + * @param monitor A new instance of {@link DefaultExceptionMonitor} is set + * if null is specified. + */ + public static void setInstance(ExceptionMonitor monitor) { + if (monitor == null) { + monitor = new DefaultExceptionMonitor(); + } + instance = monitor; + } + + /** + * Invoked when there are any uncaught exceptions. + */ + public abstract void exceptionCaught(Throwable cause, IoSession s); +} diff --git a/mina.netty/src/test/java/org/kaazing/mina/netty/DefaultExceptionMonitorTest.java b/mina.netty/src/test/java/org/kaazing/mina/netty/DefaultExceptionMonitorTest.java new file mode 100644 index 0000000000..eb1ae8c170 --- /dev/null +++ b/mina.netty/src/test/java/org/kaazing/mina/netty/DefaultExceptionMonitorTest.java @@ -0,0 +1,70 @@ +/** + * Copyright 2007-2016, Kaazing Corporation. 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. + */ +package org.kaazing.mina.netty; + + + +import java.util.Arrays; +import java.util.List; + +import org.apache.mina.core.session.IoSession; +import org.jmock.integration.junit4.JUnitRuleMockery; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.RuleChain; +import org.junit.rules.TestRule; +import org.junit.runners.model.Statement; +import org.kaazing.mina.util.DefaultExceptionMonitor; +import org.kaazing.test.util.MemoryAppender; +import org.kaazing.test.util.MethodExecutionTrace; + + +public class DefaultExceptionMonitorTest +{ + @Rule + public JUnitRuleMockery context = new JUnitRuleMockery(); + + private static final String ERROR_MESSAGE = "ERROR"; + private static final String EXCEPTION_MESSAGE = "EXCEPTION"; + private List expectedPatterns; + + public TestRule trace = new MethodExecutionTrace(); + + private TestRule checkLogMessageRule = (base, description) -> new Statement() { + @Override + public void evaluate() throws Throwable { + base.evaluate(); + MemoryAppender.assertMessagesLogged(expectedPatterns, null, null, true); + } + }; + + @Rule + public TestRule chain = RuleChain.outerRule(trace).around(checkLogMessageRule); + + @Test(expected=Error.class) + public void exceptionCaughtShouldRethrowError() throws Exception { + IoSession session = context.mock(IoSession.class); + new DefaultExceptionMonitor().exceptionCaught(new Error(ERROR_MESSAGE), session); + } + + @Test + public void shouldLogMessageIncludingSession() throws Exception { + IoSession session = context.mock(IoSession.class, "session"); + + new DefaultExceptionMonitor().exceptionCaught(new NullPointerException(EXCEPTION_MESSAGE), session); + expectedPatterns = Arrays.asList("Unexpected exception in session session"); + } +} diff --git a/mina.netty/src/test/java/org/kaazing/mina/netty/ExceptionMonitorTest.java b/mina.netty/src/test/java/org/kaazing/mina/netty/ExceptionMonitorTest.java new file mode 100644 index 0000000000..5fe1dc34c2 --- /dev/null +++ b/mina.netty/src/test/java/org/kaazing/mina/netty/ExceptionMonitorTest.java @@ -0,0 +1,47 @@ +/** + * Copyright 2007-2016, Kaazing Corporation. 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. + */ +package org.kaazing.mina.netty; + + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import org.apache.mina.core.session.IoSession; +import org.junit.Test; +import org.kaazing.mina.util.DefaultExceptionMonitor; +import org.kaazing.mina.util.ExceptionMonitor; + + +public class ExceptionMonitorTest +{ + @Test + public void getInstanceShouldReturnDefaultMonitorInitially(){ + assertTrue(ExceptionMonitor.getInstance().getClass().isAssignableFrom(DefaultExceptionMonitor.class)); + } + + @Test + public void getInstanceShouldReturnLastSetInstance () { + ExceptionMonitor expectedMonitor = new ExceptionMonitor() { + @Override + public void exceptionCaught(Throwable cause, IoSession s) { + // + } + }; + ExceptionMonitor.setInstance(expectedMonitor); + + assertEquals(expectedMonitor, ExceptionMonitor.getInstance()); + } +} diff --git a/mina.netty/src/test/java/org/kaazing/mina/netty/socket/nio/DefaultNioSocketChannelIoSessionConfigTest.java b/mina.netty/src/test/java/org/kaazing/mina/netty/socket/nio/DefaultNioSocketChannelIoSessionConfigTest.java index 3a9e9ebab9..984f2b45bf 100644 --- a/mina.netty/src/test/java/org/kaazing/mina/netty/socket/nio/DefaultNioSocketChannelIoSessionConfigTest.java +++ b/mina.netty/src/test/java/org/kaazing/mina/netty/socket/nio/DefaultNioSocketChannelIoSessionConfigTest.java @@ -28,6 +28,7 @@ import org.jboss.netty.channel.socket.DefaultSocketChannelConfig; import org.jboss.netty.channel.socket.nio.NioSocketChannelConfig; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; public class DefaultNioSocketChannelIoSessionConfigTest { @@ -110,6 +111,7 @@ public void testSetAllReceiveBufferSize() { } @Test + @Ignore("Please see: https://github.com/kaazing/gateway/issues/857") public void testSetAllSendBufferSize() { DefaultNioSocketChannelIoSessionConfig config = new DefaultNioSocketChannelIoSessionConfig(); config.init(new NioSocketChannelIoAcceptor(config)); @@ -149,6 +151,7 @@ public void testSetAllThroughputCalculationIntervalInMillis() { } @Test + @Ignore("Please see: https://github.com/kaazing/gateway/issues/857") public void testSetAllTrafficClass() { DefaultNioSocketChannelIoSessionConfig config = new DefaultNioSocketChannelIoSessionConfig(); config.init(new NioSocketChannelIoAcceptor(config)); diff --git a/mina.netty/src/test/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoAcceptorTest.java b/mina.netty/src/test/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoAcceptorTest.java new file mode 100644 index 0000000000..e4aa68a972 --- /dev/null +++ b/mina.netty/src/test/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoAcceptorTest.java @@ -0,0 +1,50 @@ +/** + * Copyright 2007-2016, Kaazing Corporation. 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. + */ +package org.kaazing.mina.netty.socket.nio; + +import static org.junit.Assert.assertEquals; + +import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; +import org.jboss.netty.channel.socket.nio.NioSocketChannelConfig; +import org.jmock.Expectations; +import org.jmock.integration.junit4.JUnitRuleMockery; +import org.junit.Rule; +import org.junit.Test; + +public class NioSocketChannelIoAcceptorTest { + + @Rule + public JUnitRuleMockery context = new JUnitRuleMockery(); + + @Test + public void transportNameShouldBeTcp() throws Exception { + final NioSocketChannelConfig socketConfig = context.mock(NioSocketChannelConfig.class, "socketConfig"); + context.checking(new Expectations() { + { + allowing(socketConfig).setOption(with(any(String.class)), with(any(int.class))); + allowing(socketConfig).setOption(with(any(String.class)), with(any(boolean.class))); + allowing(socketConfig).setReuseAddress(with(any(boolean.class))); + } + }); + + NioSocketChannelIoSessionConfig sessionConfig = new NioSocketChannelIoSessionConfig(socketConfig); + NioServerSocketChannelFactory serverChannelFactory = new NioServerSocketChannelFactory(); + NioSocketChannelIoAcceptor acceptor = new NioSocketChannelIoAcceptor(sessionConfig, serverChannelFactory); + assertEquals("tcp", acceptor.getTransportMetadata().getName()); + } + + +} diff --git a/mina.netty/src/test/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoConnectorTest.java b/mina.netty/src/test/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoConnectorTest.java new file mode 100644 index 0000000000..9bdb33bf1e --- /dev/null +++ b/mina.netty/src/test/java/org/kaazing/mina/netty/socket/nio/NioSocketChannelIoConnectorTest.java @@ -0,0 +1,47 @@ +/** + * Copyright 2007-2016, Kaazing Corporation. 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. + */ +package org.kaazing.mina.netty.socket.nio; + +import static org.junit.Assert.assertEquals; + +import org.jboss.netty.channel.socket.nio.NioSocketChannelConfig; +import org.jmock.Expectations; +import org.jmock.integration.junit4.JUnitRuleMockery; +import org.junit.Rule; +import org.junit.Test; + +public class NioSocketChannelIoConnectorTest { + + @Rule + public JUnitRuleMockery context = new JUnitRuleMockery(); + + @Test + public void transportNameShouldBeTcp() throws Exception { + final NioSocketChannelConfig socketConfig = context.mock(NioSocketChannelConfig.class, "socketConfig"); + context.checking(new Expectations() { + { + allowing(socketConfig).setOption(with(any(String.class)), with(any(int.class))); + allowing(socketConfig).setOption(with(any(String.class)), with(any(boolean.class))); + allowing(socketConfig).setReuseAddress(with(any(boolean.class))); + } + }); + + NioSocketChannelIoSessionConfig sessionConfig = new NioSocketChannelIoSessionConfig(socketConfig); + NioSocketChannelIoConnector connector = new NioSocketChannelIoConnector(sessionConfig); + assertEquals("tcp", connector.getTransportMetadata().getName()); + } + +} diff --git a/transport/bio/src/main/java/org/kaazing/gateway/transport/bio/MulticastAcceptorImpl.java b/transport/bio/src/main/java/org/kaazing/gateway/transport/bio/MulticastAcceptorImpl.java index 2cd5182eb0..fbcdcf2a4c 100644 --- a/transport/bio/src/main/java/org/kaazing/gateway/transport/bio/MulticastAcceptorImpl.java +++ b/transport/bio/src/main/java/org/kaazing/gateway/transport/bio/MulticastAcceptorImpl.java @@ -39,7 +39,6 @@ import org.apache.mina.core.session.IoSessionRecycler; import org.apache.mina.transport.socket.DatagramSessionConfigEx; import org.apache.mina.transport.socket.DefaultDatagramSessionConfigEx; -import org.apache.mina.util.ExceptionMonitor; import org.kaazing.mina.core.buffer.IoBufferAllocatorEx; import org.kaazing.mina.core.buffer.IoBufferEx; import org.kaazing.mina.core.future.BindFuture; @@ -50,6 +49,7 @@ import org.kaazing.mina.core.service.IoProcessorEx; import org.kaazing.mina.core.session.IoSessionConfigEx; import org.kaazing.mina.core.session.IoSessionEx; +import org.kaazing.mina.util.ExceptionMonitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -248,7 +248,7 @@ private IoSessionEx newSessionWithoutLock( getListeners().fireSessionCreated(session); } catch (Throwable t) { - ExceptionMonitor.getInstance().exceptionCaught(t); + ExceptionMonitor.getInstance().exceptionCaught(t, session); } return session; diff --git a/transport/bio/src/main/java/org/kaazing/gateway/transport/bio/MulticastConnectorImpl.java b/transport/bio/src/main/java/org/kaazing/gateway/transport/bio/MulticastConnectorImpl.java index 9b078b9e28..83ce31f973 100644 --- a/transport/bio/src/main/java/org/kaazing/gateway/transport/bio/MulticastConnectorImpl.java +++ b/transport/bio/src/main/java/org/kaazing/gateway/transport/bio/MulticastConnectorImpl.java @@ -42,13 +42,13 @@ import org.apache.mina.transport.socket.DatagramSessionConfigEx; import org.apache.mina.transport.socket.DefaultDatagramSessionConfigEx; import org.apache.mina.util.ConcurrentHashSet; -import org.apache.mina.util.ExceptionMonitor; import org.kaazing.gateway.resource.address.ResourceAddress; import org.kaazing.gateway.resource.address.ResourceAddressFactory; import org.kaazing.mina.core.buffer.IoBufferAllocatorEx; import org.kaazing.mina.core.service.AbstractIoConnectorEx; import org.kaazing.mina.core.service.IoProcessorEx; import org.kaazing.mina.core.session.IoSessionEx; +import org.kaazing.mina.util.ExceptionMonitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -261,7 +261,7 @@ public void add(MulticastSession session) { IoFilterChain filterChain = session.getFilterChain(); filterChain.fireExceptionCaught(e); } else { - ExceptionMonitor.getInstance().exceptionCaught(e); + ExceptionMonitor.getInstance().exceptionCaught(e, session); } } } diff --git a/transport/nio/src/test/java/org/kaazing/gateway/transport/tcp/specification/TcpConnectorLoggingIT.java b/transport/nio/src/test/java/org/kaazing/gateway/transport/tcp/specification/TcpConnectorLoggingIT.java new file mode 100644 index 0000000000..0a1751ef2c --- /dev/null +++ b/transport/nio/src/test/java/org/kaazing/gateway/transport/tcp/specification/TcpConnectorLoggingIT.java @@ -0,0 +1,150 @@ +/** + * Copyright 2007-2016, Kaazing Corporation. 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. + */ +package org.kaazing.gateway.transport.tcp.specification; + +import static java.util.concurrent.TimeUnit.SECONDS; + +import java.net.InetSocketAddress; +import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import org.apache.mina.core.buffer.IoBuffer; +import org.apache.mina.core.future.ConnectFuture; +import org.apache.mina.core.future.IoFuture; +import org.apache.mina.core.future.IoFutureListener; +import org.apache.mina.core.session.IoSession; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.DisableOnDebug; +import org.junit.rules.RuleChain; +import org.junit.rules.TestRule; +import org.junit.rules.Timeout; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameter; +import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.model.Statement; +import org.kaazing.gateway.transport.IoHandlerAdapter; +import org.kaazing.k3po.junit.annotation.Specification; +import org.kaazing.k3po.junit.rules.K3poRule; +import org.kaazing.mina.core.buffer.IoBufferAllocatorEx; +import org.kaazing.mina.core.buffer.IoBufferEx; +import org.kaazing.mina.core.session.IoSessionEx; +import org.kaazing.test.util.MemoryAppender; +import org.kaazing.test.util.MethodExecutionTrace; +import org.kaazing.test.util.ResolutionTestUtils; + +/** + * RFC-793 + */ +@RunWith(Parameterized.class) +public class TcpConnectorLoggingIT { + + private final K3poRule k3po = new K3poRule().setScriptRoot("org/kaazing/specification/tcp/rfc793"); + + private TcpConnectorRule connector = new TcpConnectorRule(); + + private static String networkInterface = ResolutionTestUtils.getLoopbackInterface(); + + private List expectedPatterns; + + public TestRule trace = new MethodExecutionTrace(); + public TestRule timeoutRule = new DisableOnDebug(Timeout.builder().withTimeout(10, TimeUnit.SECONDS) + .withLookingForStuckThread(true).build()); + + private TestRule checkLogMessageRule = (base, description) -> new Statement() { + @Override + public void evaluate() throws Throwable { + base.evaluate(); + MemoryAppender.assertMessagesLogged(expectedPatterns, null, null, true); + } + }; + + @Rule + public TestRule chain = RuleChain.outerRule(trace).around(checkLogMessageRule).around(connector).around(k3po).around(timeoutRule); + + + @Parameters + public static Collection data() { + return Arrays.asList(new Object[][] { + {"tcp://127.0.0.1:8080"}, {"tcp://[@" + networkInterface + "]:8080"} + }); + } + + @Parameter + public String uri; + + private void connectTo8080(IoHandlerAdapter handler) throws InterruptedException { + final String connectURIString = uri; + ConnectFuture x = connector.connect(connectURIString, handler, null); + x.await(1, SECONDS); + Assert.assertTrue("Failed to connect, exception " + x.getException(), x.isConnected()); + } + + private void writeStringMessageToSession(String message, IoSession session) { + ByteBuffer data = ByteBuffer.allocate(message.length()); + data.put(message.getBytes()); + + data.flip(); + + IoBufferAllocatorEx allocator = ((IoSessionEx) session).getBufferAllocator(); + + session.write(allocator.wrap(data.duplicate(), IoBufferEx.FLAG_SHARED)).addListener(new IoFutureListener() { + @Override + public void operationComplete(IoFuture future) { + throw new NullPointerException(); + } + }); + } + + @Test + @Specification({ + "echo.data/server" + }) + public void exceptionMonitorShouldLogMessage() throws Exception { + k3po.start(); + k3po.awaitBarrier("BOUND"); + connectTo8080(new IoHandlerAdapter(){ + private int counter = 1; + private DataMatcher dataMatch = new DataMatcher("server data " + counter); + + @Override + protected void doSessionOpened(IoSessionEx session) throws Exception { + writeStringMessageToSession("client data " + counter, session); + InetSocketAddress socketAddress = (InetSocketAddress)session.getLocalAddress(); + expectedPatterns = Arrays.asList(String.format("\\[tcp#%d 127.0.0.1:%d\\] java.lang.NullPointerException", session.getId(), socketAddress.getPort())); + } + + @Override + protected void doMessageReceived(IoSessionEx session, Object message) throws Exception { + String decoded = new String(((IoBuffer) message).array()); + + if (dataMatch.addFragment(decoded) && counter < 2) { + counter++; + writeStringMessageToSession("client data " + counter, session); + dataMatch = new DataMatcher("server data " + counter); + } + } + }); + k3po.finish(); + + } + +} diff --git a/transport/spi/src/main/java/org/kaazing/gateway/transport/AbstractBridgeService.java b/transport/spi/src/main/java/org/kaazing/gateway/transport/AbstractBridgeService.java index f7960b3597..96552159fb 100644 --- a/transport/spi/src/main/java/org/kaazing/gateway/transport/AbstractBridgeService.java +++ b/transport/spi/src/main/java/org/kaazing/gateway/transport/AbstractBridgeService.java @@ -25,13 +25,11 @@ import org.apache.mina.core.service.TransportMetadata; import org.apache.mina.core.session.DefaultIoSessionDataStructureFactory; import org.apache.mina.core.session.IoSessionInitializer; -import org.apache.mina.util.ExceptionMonitor; -import org.slf4j.Logger; -import org.kaazing.gateway.transport.LoggingFilter; - import org.kaazing.mina.core.service.AbstractIoServiceEx; import org.kaazing.mina.core.service.IoProcessorEx; import org.kaazing.mina.core.session.IoSessionConfigEx; +import org.kaazing.mina.util.ExceptionMonitor; +import org.slf4j.Logger; public abstract class AbstractBridgeService> extends AbstractIoServiceEx implements BridgeService { @@ -91,7 +89,7 @@ protected T newSession(IoSessionInitializer initializer, IoF try { this.getFilterChainBuilder().buildFilterChain(filterChain); } catch (Throwable t) { - ExceptionMonitor.getInstance().exceptionCaught(t); + ExceptionMonitor.getInstance().exceptionCaught(t, session); } addLoggerFilter(session, getLogger()); diff --git a/transport/spi/src/main/java/org/kaazing/gateway/transport/LoggingUtils.java b/transport/spi/src/main/java/org/kaazing/gateway/transport/LoggingUtils.java index f10fdfb805..d1bfb708bc 100644 --- a/transport/spi/src/main/java/org/kaazing/gateway/transport/LoggingUtils.java +++ b/transport/spi/src/main/java/org/kaazing/gateway/transport/LoggingUtils.java @@ -31,11 +31,12 @@ import org.kaazing.gateway.resource.address.ResourceAddress; import org.kaazing.mina.core.session.IoSessionEx; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class LoggingUtils { private static final String HOST_PORT_FORMAT = "%s:%d"; private static final TypedAttributeKey LOG_ID_ATTRIBUTE - = new TypedAttributeKey(LoggingUtils.class, "logId"); + = new TypedAttributeKey<>(LoggingUtils.class, "logId"); private LoggingUtils() { // so as not to be instantiated @@ -70,6 +71,15 @@ public static String getId(IoSession session) { return result; } + /** + * Logs an unexpected exception in the same way LoggingFilter would, using the transport + * logger for the transport of the given session. + */ + public static void log(IoSession session, Throwable t) { + Logger logger = getTransportLogger(session); + log(session, logger, t); + } + /** * Logs an unexpected exception in the same way LoggingFilter would. */ @@ -123,8 +133,7 @@ private static void logIOException(String message, Logger logger, Throwable t) { * @return */ static String getUserIdentifier(IoSession session) { - IoService service = session.getService(); - boolean isAcceptor = service instanceof IoAcceptor || service instanceof BridgeAcceptor; + boolean isAcceptor = isAcceptor(session); SocketAddress hostPortAddress = isAcceptor ? session.getRemoteAddress() : session.getLocalAddress(); SocketAddress identityAddress = isAcceptor ? session.getLocalAddress() : session.getRemoteAddress(); String identity = resolveIdentity(identityAddress, (IoSessionEx)session); @@ -132,6 +141,11 @@ static String getUserIdentifier(IoSession session) { return identity == null ? hostPort : format("%s %s", identity, hostPort); } + private static boolean isAcceptor(IoSession session) { + IoService service = session.getService(); + return service instanceof IoAcceptor || service instanceof BridgeAcceptor; + } + /** * Method performing identity resolution - attempts to extract a subject from the current * IoSessionEx session @@ -200,4 +214,10 @@ static ResourceAddress getLowestTransportLayer(ResourceAddress transport) { return transport; } + private static Logger getTransportLogger(IoSession session) { + String loggerName = "transport." + session.getService().getTransportMetadata().getName() + + (isAcceptor(session) ? ".accept" : ".connect"); + return LoggerFactory.getLogger(loggerName); + } + } diff --git a/transport/spi/src/main/java/org/kaazing/gateway/transport/TransportExceptionMonitor.java b/transport/spi/src/main/java/org/kaazing/gateway/transport/TransportExceptionMonitor.java new file mode 100644 index 0000000000..ba636e1a2f --- /dev/null +++ b/transport/spi/src/main/java/org/kaazing/gateway/transport/TransportExceptionMonitor.java @@ -0,0 +1,42 @@ +/** + * Copyright 2007-2016, Kaazing Corporation. 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. + */ +package org.kaazing.gateway.transport; + +import org.apache.mina.core.service.IoService; +import org.apache.mina.core.session.IoSession; +import org.kaazing.mina.util.ExceptionMonitor; +import org.slf4j.Logger; + +/** + * A default {@link ExceptionMonitor} implementation that logs uncaught + * exceptions using {@link Logger}. + *

+ * All {@link IoService}s have this implementation as a default exception + * monitor. + * + * ExceptionMonitor to be used with Kaazing Gateway transports + */ +public class TransportExceptionMonitor extends ExceptionMonitor { + + @Override + public void exceptionCaught(Throwable cause, IoSession session) { + if (cause instanceof Error) { + throw (Error) cause; + } + LoggingUtils.log(session, cause); + } + +} diff --git a/transport/spi/src/main/java/org/kaazing/gateway/transport/TransportFactory.java b/transport/spi/src/main/java/org/kaazing/gateway/transport/TransportFactory.java index 5d9b818599..5729b22cc9 100644 --- a/transport/spi/src/main/java/org/kaazing/gateway/transport/TransportFactory.java +++ b/transport/spi/src/main/java/org/kaazing/gateway/transport/TransportFactory.java @@ -34,6 +34,8 @@ import org.kaazing.gateway.resource.address.Protocol; import org.kaazing.gateway.resource.address.ResourceAddress; import org.kaazing.gateway.transport.dispatch.ProtocolDispatcher; +import org.kaazing.mina.util.ExceptionMonitor; + public class TransportFactory { @@ -43,6 +45,10 @@ public class TransportFactory { private final Map protocolsBySchemeName; private final Map dispatchersByProtocolName; + static{ + ExceptionMonitor.setInstance(new TransportExceptionMonitor()); + } + private TransportFactory(Map transportsByName, Map transportsBySchemeName, Map proxyHandlersByType, diff --git a/transport/spi/src/test/java/org/kaazing/gateway/transport/TransportExceptionMonitorTest.java b/transport/spi/src/test/java/org/kaazing/gateway/transport/TransportExceptionMonitorTest.java new file mode 100644 index 0000000000..91aed3f659 --- /dev/null +++ b/transport/spi/src/test/java/org/kaazing/gateway/transport/TransportExceptionMonitorTest.java @@ -0,0 +1,98 @@ +/** + * Copyright 2007-2016, Kaazing Corporation. 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. + */ +package org.kaazing.gateway.transport; + + +import java.net.SocketAddress; +import java.util.Arrays; +import java.util.List; + +import javax.security.auth.Subject; + +import org.apache.mina.core.service.TransportMetadata; +import org.apache.mina.core.session.IoSession; +import org.jmock.integration.junit4.JUnitRuleMockery; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.RuleChain; +import org.junit.rules.TestRule; +import org.junit.runners.model.Statement; +import org.kaazing.gateway.resource.address.ResourceAddressFactory; +import org.kaazing.gateway.transport.test.Expectations; +import org.kaazing.mina.core.service.IoServiceEx; +import org.kaazing.mina.core.session.IoSessionEx; +import org.kaazing.test.util.MemoryAppender; +import org.kaazing.test.util.MethodExecutionTrace; + + +public class TransportExceptionMonitorTest +{ + public static long TEST_SESSION_NUMBER = 23; + + @Rule + public JUnitRuleMockery context = new JUnitRuleMockery(); + + private static final String ERROR_MESSAGE = "ERROR"; + private static final String EXCEPTION_MESSAGE = "EXCEPTION"; + private List expectedPatterns; + + public TestRule trace = new MethodExecutionTrace(); + + private TestRule checkLogMessageRule = (base, description) -> new Statement() { + @Override + public void evaluate() throws Throwable { + base.evaluate(); + MemoryAppender.assertMessagesLogged(expectedPatterns, null, null, true); + } + }; + + @Rule + public TestRule chain = RuleChain.outerRule(trace).around(checkLogMessageRule); + + @Test(expected=Error.class) + public void exceptionCaughtShouldRethrowError() throws Exception { + IoSession session = context.mock(IoSession.class); + new TransportExceptionMonitor().exceptionCaught(new Error(ERROR_MESSAGE), session); + } + + @Test + public void shouldLogMessageIncludingSession() throws Exception { + IoSessionEx session = context.mock(IoSessionEx.class, "session"); + IoServiceEx service = context.mock(IoServiceEx.class, "service"); + TransportMetadata metadata = context.mock(TransportMetadata.class, "metadata"); + ResourceAddressFactory addressFactory = ResourceAddressFactory.newResourceAddressFactory(); + String addressURI = "ws://localhost:2121/jms"; + SocketAddress address = addressFactory.newResourceAddress(addressURI); + Subject subject = new Subject(); + + context.checking(new Expectations() { + { + allowing(session).getService(); will(returnValue(service)); + oneOf(session).getId(); will(returnValue(TEST_SESSION_NUMBER)); + oneOf(service).getTransportMetadata(); will(returnValue(metadata)); + oneOf(session).getTransportMetadata(); will(returnValue(metadata)); + allowing(metadata).getName(); will(returnValue("wsn")); + oneOf(session).getAttribute(with(any(Object.class))); will(returnValue(null)); + oneOf(session).getLocalAddress(); will(returnValue(address)); + oneOf(session).getRemoteAddress(); will(returnValue(address)); + oneOf(session).getSubject(); will(returnValue(subject)); + oneOf(session).setAttribute(with(any(Object.class)), with(any(String.class))); + } + }); + new TransportExceptionMonitor().exceptionCaught(new NullPointerException(EXCEPTION_MESSAGE), session); + expectedPatterns = Arrays.asList("\\[wsn#23 127.0.0.1:2121\\] java.lang.NullPointerException: EXCEPTION"); + } +} From 0328979683b96be7642d8640c57bca5b253a3520 Mon Sep 17 00:00:00 2001 From: Kaazing build Date: Fri, 20 Jan 2017 20:16:42 +0000 Subject: [PATCH 39/53] Update version to develop-SNAPSHOT --- bom/pom.xml | 2 +- bridge/gateway.bridge/pom.xml | 2 +- bridge/gateway.client.javascript.bridge/pom.xml | 2 +- bridge/pom.xml | 2 +- distribution/pom.xml | 2 +- management/pom.xml | 2 +- mina.core/core/pom.xml | 2 +- mina.core/integration-beans/pom.xml | 2 +- mina.core/integration-jmx/pom.xml | 2 +- mina.core/integration-ognl/pom.xml | 2 +- mina.core/legal/pom.xml | 2 +- mina.core/parent/pom.xml | 2 +- mina.core/pom.xml | 2 +- mina.core/transport-serial/pom.xml | 2 +- mina.netty/pom.xml | 2 +- pom.xml | 2 +- resource.address/http/pom.xml | 2 +- resource.address/httpx/pom.xml | 2 +- resource.address/httpxdraft/pom.xml | 2 +- resource.address/httpxe/pom.xml | 2 +- resource.address/pipe/pom.xml | 2 +- resource.address/rtmp/pom.xml | 2 +- resource.address/spi/pom.xml | 2 +- resource.address/sse/pom.xml | 2 +- resource.address/ssl/pom.xml | 2 +- resource.address/tcp/pom.xml | 2 +- resource.address/udp/pom.xml | 2 +- resource.address/ws/pom.xml | 2 +- resource.address/wsdraft/pom.xml | 2 +- resource.address/wse/pom.xml | 2 +- resource.address/wsn/pom.xml | 2 +- resource.address/wsx/pom.xml | 2 +- resource.address/wsxdraft/pom.xml | 2 +- security/pom.xml | 2 +- server.api/pom.xml | 2 +- server.spi/pom.xml | 2 +- server/pom.xml | 2 +- service/amqp/pom.xml | 2 +- service/broadcast/pom.xml | 2 +- service/echo/pom.xml | 2 +- service/http.balancer/pom.xml | 2 +- service/http.directory/pom.xml | 2 +- service/http.proxy/pom.xml | 2 +- service/proxy/pom.xml | 2 +- service/spi/pom.xml | 2 +- service/turn.rest/pom.xml | 2 +- service/update.check.management/pom.xml | 2 +- service/update.check/pom.xml | 2 +- test.util/pom.xml | 2 +- transport/bio/pom.xml | 2 +- transport/http/pom.xml | 2 +- transport/nio/pom.xml | 2 +- transport/pipe/pom.xml | 2 +- transport/spi/pom.xml | 2 +- transport/sse/pom.xml | 2 +- transport/ssl/pom.xml | 2 +- transport/ws/pom.xml | 2 +- transport/wseb/pom.xml | 2 +- transport/wsn/pom.xml | 2 +- util/pom.xml | 2 +- 60 files changed, 60 insertions(+), 60 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 0ce2da09f6..d0ff23c9c5 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT gateway.bom diff --git a/bridge/gateway.bridge/pom.xml b/bridge/gateway.bridge/pom.xml index 9e79c3a02a..e8cccb530b 100644 --- a/bridge/gateway.bridge/pom.xml +++ b/bridge/gateway.bridge/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway.bridge.parent - 5.4.0 + develop-SNAPSHOT gateway.bridge diff --git a/bridge/gateway.client.javascript.bridge/pom.xml b/bridge/gateway.client.javascript.bridge/pom.xml index 5bfa944992..8a4e1edad8 100644 --- a/bridge/gateway.client.javascript.bridge/pom.xml +++ b/bridge/gateway.client.javascript.bridge/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway.bridge.parent - 5.4.0 + develop-SNAPSHOT gateway.client.javascript.bridge diff --git a/bridge/pom.xml b/bridge/pom.xml index 6c31eef18e..35afac030b 100644 --- a/bridge/pom.xml +++ b/bridge/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT gateway.bridge.parent diff --git a/distribution/pom.xml b/distribution/pom.xml index 836b7af381..515f45fb46 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT gateway.distribution diff --git a/management/pom.xml b/management/pom.xml index d9578ce5a5..5ac00edc3c 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT gateway.management diff --git a/mina.core/core/pom.xml b/mina.core/core/pom.xml index da04cdc0d3..e9b3e8e894 100644 --- a/mina.core/core/pom.xml +++ b/mina.core/core/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - 5.4.0 + develop-SNAPSHOT ../parent diff --git a/mina.core/integration-beans/pom.xml b/mina.core/integration-beans/pom.xml index 2316536b86..5b4d4216dc 100644 --- a/mina.core/integration-beans/pom.xml +++ b/mina.core/integration-beans/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - 5.4.0 + develop-SNAPSHOT ../parent diff --git a/mina.core/integration-jmx/pom.xml b/mina.core/integration-jmx/pom.xml index 8424c5296c..e03d81951d 100644 --- a/mina.core/integration-jmx/pom.xml +++ b/mina.core/integration-jmx/pom.xml @@ -6,7 +6,7 @@ org.kaazing mina-parent - 5.4.0 + develop-SNAPSHOT ../parent mina-integration-jmx diff --git a/mina.core/integration-ognl/pom.xml b/mina.core/integration-ognl/pom.xml index b4fca5eefa..64827ea660 100644 --- a/mina.core/integration-ognl/pom.xml +++ b/mina.core/integration-ognl/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - 5.4.0 + develop-SNAPSHOT ../parent diff --git a/mina.core/legal/pom.xml b/mina.core/legal/pom.xml index 460f3f9674..2cf3813d08 100644 --- a/mina.core/legal/pom.xml +++ b/mina.core/legal/pom.xml @@ -4,7 +4,7 @@ org.kaazing mina-build - 5.4.0 + develop-SNAPSHOT mina-legal diff --git a/mina.core/parent/pom.xml b/mina.core/parent/pom.xml index 7cd535441c..6122143759 100644 --- a/mina.core/parent/pom.xml +++ b/mina.core/parent/pom.xml @@ -4,7 +4,7 @@ org.kaazing mina-build - 5.4.0 + develop-SNAPSHOT mina-parent diff --git a/mina.core/pom.xml b/mina.core/pom.xml index 795995ef1b..26aa0b756a 100644 --- a/mina.core/pom.xml +++ b/mina.core/pom.xml @@ -7,7 +7,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT mina-build diff --git a/mina.core/transport-serial/pom.xml b/mina.core/transport-serial/pom.xml index 188e164ed3..cb1311f00b 100644 --- a/mina.core/transport-serial/pom.xml +++ b/mina.core/transport-serial/pom.xml @@ -6,7 +6,7 @@ org.kaazing mina-parent - 5.4.0 + develop-SNAPSHOT diff --git a/mina.netty/pom.xml b/mina.netty/pom.xml index 6618a1912b..840304f0a4 100644 --- a/mina.netty/pom.xml +++ b/mina.netty/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT mina.netty jar diff --git a/pom.xml b/pom.xml index 9a264a52b8..8f4417bc46 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ gateway Kaazing Gateway - 5.4.0 + develop-SNAPSHOT pom https://github.com/kaazing/gateway diff --git a/resource.address/http/pom.xml b/resource.address/http/pom.xml index be78b57da4..2e15ba644d 100644 --- a/resource.address/http/pom.xml +++ b/resource.address/http/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/httpx/pom.xml b/resource.address/httpx/pom.xml index 5e7a9adf53..18844897b3 100644 --- a/resource.address/httpx/pom.xml +++ b/resource.address/httpx/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/httpxdraft/pom.xml b/resource.address/httpxdraft/pom.xml index b61773fbec..e56a0fa25a 100644 --- a/resource.address/httpxdraft/pom.xml +++ b/resource.address/httpxdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/httpxe/pom.xml b/resource.address/httpxe/pom.xml index cca8caa5fb..32c654f14c 100644 --- a/resource.address/httpxe/pom.xml +++ b/resource.address/httpxe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/pipe/pom.xml b/resource.address/pipe/pom.xml index c7be94e1f0..23e67c0720 100644 --- a/resource.address/pipe/pom.xml +++ b/resource.address/pipe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/rtmp/pom.xml b/resource.address/rtmp/pom.xml index 239820afd8..467542884c 100644 --- a/resource.address/rtmp/pom.xml +++ b/resource.address/rtmp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/spi/pom.xml b/resource.address/spi/pom.xml index 0eb079b84f..0125ad02e8 100644 --- a/resource.address/spi/pom.xml +++ b/resource.address/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/sse/pom.xml b/resource.address/sse/pom.xml index 40e6920313..ecc0679c85 100644 --- a/resource.address/sse/pom.xml +++ b/resource.address/sse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/ssl/pom.xml b/resource.address/ssl/pom.xml index f780daba59..c108623a17 100644 --- a/resource.address/ssl/pom.xml +++ b/resource.address/ssl/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/tcp/pom.xml b/resource.address/tcp/pom.xml index 886345c0a5..ff80ae7964 100644 --- a/resource.address/tcp/pom.xml +++ b/resource.address/tcp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/udp/pom.xml b/resource.address/udp/pom.xml index 7ad6c5515a..8f1bbe3b70 100644 --- a/resource.address/udp/pom.xml +++ b/resource.address/udp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/ws/pom.xml b/resource.address/ws/pom.xml index 8d68187776..345663ab87 100644 --- a/resource.address/ws/pom.xml +++ b/resource.address/ws/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/wsdraft/pom.xml b/resource.address/wsdraft/pom.xml index f173ca0afd..6e924d1b59 100644 --- a/resource.address/wsdraft/pom.xml +++ b/resource.address/wsdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/wse/pom.xml b/resource.address/wse/pom.xml index d45e9a201f..7b044d4cf8 100644 --- a/resource.address/wse/pom.xml +++ b/resource.address/wse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.resource.address.wse diff --git a/resource.address/wsn/pom.xml b/resource.address/wsn/pom.xml index 321d840485..dc9ff1e99a 100644 --- a/resource.address/wsn/pom.xml +++ b/resource.address/wsn/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/wsx/pom.xml b/resource.address/wsx/pom.xml index 5c6007666d..7c05fe686a 100644 --- a/resource.address/wsx/pom.xml +++ b/resource.address/wsx/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml diff --git a/resource.address/wsxdraft/pom.xml b/resource.address/wsxdraft/pom.xml index 689543e4bb..4e0d44464d 100644 --- a/resource.address/wsxdraft/pom.xml +++ b/resource.address/wsxdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.resource.address.wsxdraft diff --git a/security/pom.xml b/security/pom.xml index eff0e3abe8..7303fa427d 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT gateway.security diff --git a/server.api/pom.xml b/server.api/pom.xml index 6ddf8e8213..6687b49e8a 100644 --- a/server.api/pom.xml +++ b/server.api/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT gateway.server.api diff --git a/server.spi/pom.xml b/server.spi/pom.xml index 9c523993af..9b0273b3dc 100644 --- a/server.spi/pom.xml +++ b/server.spi/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT gateway.server.spi diff --git a/server/pom.xml b/server/pom.xml index 3da5254872..94b38afd50 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT gateway.server Kaazing WebSocket Gateway - Server diff --git a/service/amqp/pom.xml b/service/amqp/pom.xml index 83d6e14a72..6d7ccd4aac 100644 --- a/service/amqp/pom.xml +++ b/service/amqp/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/service/broadcast/pom.xml b/service/broadcast/pom.xml index d4d2ddf1cf..835c3f19e8 100644 --- a/service/broadcast/pom.xml +++ b/service/broadcast/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.service.broadcast diff --git a/service/echo/pom.xml b/service/echo/pom.xml index 00bef1f81d..c21c22c0ce 100644 --- a/service/echo/pom.xml +++ b/service/echo/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.service.echo diff --git a/service/http.balancer/pom.xml b/service/http.balancer/pom.xml index d04a7414b1..3e669bb8e1 100644 --- a/service/http.balancer/pom.xml +++ b/service/http.balancer/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.service.http.balancer diff --git a/service/http.directory/pom.xml b/service/http.directory/pom.xml index f11882f175..945eaf6007 100644 --- a/service/http.directory/pom.xml +++ b/service/http.directory/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.service.http.directory diff --git a/service/http.proxy/pom.xml b/service/http.proxy/pom.xml index 5e6d27e726..46e7f9e85a 100644 --- a/service/http.proxy/pom.xml +++ b/service/http.proxy/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.service.http.proxy diff --git a/service/proxy/pom.xml b/service/proxy/pom.xml index 0da6986691..be9cad819d 100644 --- a/service/proxy/pom.xml +++ b/service/proxy/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.service.proxy diff --git a/service/spi/pom.xml b/service/spi/pom.xml index 5d5c70cb20..0d8c5d0b83 100644 --- a/service/spi/pom.xml +++ b/service/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.service diff --git a/service/turn.rest/pom.xml b/service/turn.rest/pom.xml index da0b4582a1..d0c5a8b88a 100644 --- a/service/turn.rest/pom.xml +++ b/service/turn.rest/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.service.turn.rest diff --git a/service/update.check.management/pom.xml b/service/update.check.management/pom.xml index cb76b6adfb..d8da0695f8 100644 --- a/service/update.check.management/pom.xml +++ b/service/update.check.management/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.service.update.check.management diff --git a/service/update.check/pom.xml b/service/update.check/pom.xml index 42df4bc74d..27c9a815ae 100644 --- a/service/update.check/pom.xml +++ b/service/update.check/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.service.update.check diff --git a/test.util/pom.xml b/test.util/pom.xml index a5c71831fd..039798b6ee 100644 --- a/test.util/pom.xml +++ b/test.util/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT test.util diff --git a/transport/bio/pom.xml b/transport/bio/pom.xml index 7e6c7dd47a..cce3b1df0f 100644 --- a/transport/bio/pom.xml +++ b/transport/bio/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.transport.bio diff --git a/transport/http/pom.xml b/transport/http/pom.xml index d48c59e864..dc7eddfd7e 100644 --- a/transport/http/pom.xml +++ b/transport/http/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.transport.http diff --git a/transport/nio/pom.xml b/transport/nio/pom.xml index 6c56c91262..0272b234be 100644 --- a/transport/nio/pom.xml +++ b/transport/nio/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.transport.nio diff --git a/transport/pipe/pom.xml b/transport/pipe/pom.xml index 263b8c7469..db4d4b2332 100644 --- a/transport/pipe/pom.xml +++ b/transport/pipe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.transport.pipe diff --git a/transport/spi/pom.xml b/transport/spi/pom.xml index dd20af3a3a..5c0b9d0195 100644 --- a/transport/spi/pom.xml +++ b/transport/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.transport diff --git a/transport/sse/pom.xml b/transport/sse/pom.xml index b77a0c3920..c108c89ad3 100644 --- a/transport/sse/pom.xml +++ b/transport/sse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.transport.sse diff --git a/transport/ssl/pom.xml b/transport/ssl/pom.xml index 4a2395c990..71f5435e81 100644 --- a/transport/ssl/pom.xml +++ b/transport/ssl/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.transport.ssl diff --git a/transport/ws/pom.xml b/transport/ws/pom.xml index 17cbd147fa..a45b774b65 100644 --- a/transport/ws/pom.xml +++ b/transport/ws/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.transport.ws diff --git a/transport/wseb/pom.xml b/transport/wseb/pom.xml index eb0b82c40d..0f2d04d533 100644 --- a/transport/wseb/pom.xml +++ b/transport/wseb/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.transport.wseb diff --git a/transport/wsn/pom.xml b/transport/wsn/pom.xml index 3106c66f23..782db03c45 100644 --- a/transport/wsn/pom.xml +++ b/transport/wsn/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT ../../pom.xml gateway.transport.wsn diff --git a/util/pom.xml b/util/pom.xml index e7ae2031e7..1066709e67 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.0 + develop-SNAPSHOT gateway.util Gateway Utils From b64a2679981200dd0b8d8d56c96836bcce97bb95 Mon Sep 17 00:00:00 2001 From: vstratan Date: Mon, 23 Jan 2017 12:21:15 +0200 Subject: [PATCH 40/53] Removed testcase as it is redundant --- .../management/jmx/JmxRoundTripLatencyIT.java | 32 +--- ...tWsebRoundTripLatencyAttributesFromJMX.rpt | 149 ------------------ 2 files changed, 1 insertion(+), 180 deletions(-) delete mode 100644 management/src/test/scripts/org/kaazing/gateway/management/jmx/echoServiceToGetWsebRoundTripLatencyAttributesFromJMX.rpt diff --git a/management/src/test/java/org/kaazing/gateway/management/jmx/JmxRoundTripLatencyIT.java b/management/src/test/java/org/kaazing/gateway/management/jmx/JmxRoundTripLatencyIT.java index a599e1eeb0..3cef88a556 100644 --- a/management/src/test/java/org/kaazing/gateway/management/jmx/JmxRoundTripLatencyIT.java +++ b/management/src/test/java/org/kaazing/gateway/management/jmx/JmxRoundTripLatencyIT.java @@ -111,6 +111,7 @@ public class JmxRoundTripLatencyIT { @Rule public TestRule chain = createRuleChain(gateway, k3po).around(jmxConnection); + @Specification("echoServiceToGetRoundTripLatencyAttributesFromJMX") @Test public void getRoundTripLatencyAttributesFromJmx() throws Exception { @@ -139,35 +140,4 @@ public void getRoundTripLatencyAttributesFromJmx() throws Exception { k3po.finish(); } - @Ignore("This test should be written in HTTP so its generic and doesn't break as layers change," - + " plus given that the above works and we have unit tests proving it should work for wseb") - @Specification("echoServiceToGetWsebRoundTripLatencyAttributesFromJMX") - @Test - public void getWsebRoundTripLatencyAttributesFromJmx() throws Exception { - Long latency = null; - Long latencyTimestamp = null; - Long currentTimestamp = currentTimeMillis(); - - k3po.start(); - - k3po.awaitBarrier("SESSION_ESTABLISHED"); - - MBeanServerConnection mbeanServerConn = jmxConnection.getConnection(); - Set mbeanNames = mbeanServerConn.queryNames(null, null); - String MBeanPrefix = "subtype=services,serviceType=echo,serviceId=\"" + WSE_URI + "\",name=sessions"; - for (ObjectName name : mbeanNames) { - if (name.toString().indexOf(MBeanPrefix) > 0) { - latency = (Long) mbeanServerConn.getAttribute(name, "LastRoundTripLatency"); - latencyTimestamp = (Long) mbeanServerConn.getAttribute(name, "LastRoundTripLatencyTimestamp"); - } - } - - k3po.notifyBarrier("READ_LATENCY_ATTRIBUTES"); - - assertTrue("Could not retrieve Round Trip Latency from Jmx", latency > -1); - assertTrue("Could not retrieve Round Trip Latency Timestamp from Jmx", latencyTimestamp > currentTimestamp); - - k3po.finish(); - } - } diff --git a/management/src/test/scripts/org/kaazing/gateway/management/jmx/echoServiceToGetWsebRoundTripLatencyAttributesFromJMX.rpt b/management/src/test/scripts/org/kaazing/gateway/management/jmx/echoServiceToGetWsebRoundTripLatencyAttributesFromJMX.rpt deleted file mode 100644 index 4540121d47..0000000000 --- a/management/src/test/scripts/org/kaazing/gateway/management/jmx/echoServiceToGetWsebRoundTripLatencyAttributesFromJMX.rpt +++ /dev/null @@ -1,149 +0,0 @@ -# -# Copyright 2007-2016, Kaazing Corporation. 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. -# - -# create request (as done by .Net 3.5 client) - -connect tcp://localhost:8123 -connected - -# Send create request - -write "POST /;post/echo/;e/cb HTTP/1.1\r\n" -write "X-WebSocket-Version: wseb-1.0\r\n" -write "X-Accept-Commands: ping\r\n" -write "X-Origin: privileged://localhost:8123\r\n" -write "X-Origin-privileged%3A%2F%2Flocalhost%3A8123: privileged://localhost:8123\r\n" -write "Host: localhost:8123\r\n" -write "Content-Length: 3\r\n" -write "Expect: 100-continue\r\n" -write "Connection: Keep-Alive\r\n" -write "\r\n" -write ">|<" - -write notify CREATE_REQUESTED - -read await CREATE_REQUESTED - -read "HTTP/1.1 200 OK\r\n" -read "Cache-Control: no-cache\r\n" -read "Content-Length: .*\r\n" -read "Content-Type: text/plain;charset=UTF-8\r\n" -read /Date: .*\r\n/ -read "Server: Kaazing Gateway\r\n" -read "\r\n" -read "HTTP/1.1 201 Created\r\n" -read "Content-Type: text/plain;charset=UTF-8\r\n" -# read "Content-Length: 132\r\n" -read "\r\n" -# Example: http://localhost:8123/echo/;e/ub/fUOutUjjl9sgFumZWv1XySfdooieOf7e -read "http://localhost:8123" /(?.*)\n/ -read "http://localhost:8123" /(?.*)\n/ - -read notify CREATED - -# upstream request (PONG response) on same TCP connection -write await PING_RECEIVED -# write "POST /;post/echo/;e/ub/fUOutUjjl9sgFumZWv1XySfdooieOf7e HTTP/1.1\r\n" -write "POST /;post" -write ${up} -write " HTTP/1.1\r\n" -write "Content-Type: application/octet-stream\r\n" -write "X-WebSocket-Version: wseb-1.0\r\n" -write "X-Origin: privileged://localhost:8123\r\n" -write "X-Origin-privileged%3A%2F%2Flocalhost%3A8123: privileged://localhost:8123\r\n" -write "Host: localhost:8123\r\n" -write "Content-Length: 6\r\n" -write "Expect: 100-continue\r\n" -write "Connection: Close\r\n" -write "\r\n" -write [0x8a 0x00] # pong -write [0x01 0x30 0x31 0xff] # reconnect -write notify PONG_REPLY_SENT - -read "HTTP/1.1 200 OK\r\n" -read "Content-Length: 19\r\n" -read "Content-Type: text/plain;charset=UTF-8\r\n" -read /Date: .*\r\n/ -read "Server: Kaazing Gateway\r\n" -read "\r\n" -read "HTTP/1.1 200 OK\r\n" -read "\r\n" - -closed - -# downstream on separate TCP connection -connect tcp://localhost:8123 -connected -write await CREATED -# write "POST /;post/echo/;e/db/fUOutUjjl9sgFumZWv1XySfdooieOf7e?.kf=0&.kp=2048&.kcc=private HTTP/1.1\r\n" -write "POST /;post" -write ${down} -write "?.kf=0&.kp=2048&.kcc=private HTTP/1.1\r\n" -write "Content-Type: text/plain\r\n" -write "X-WebSocket-Version: wseb-1.0\r\n" -write "X-Origin: privileged://localhost:8123\r\n" -write "X-Origin-privileged%3A%2F%2Flocalhost%3A8123: privileged://localhost:8123\r\n" -write "Host: localhost:8123\r\n" -write "Content-Length: 3\r\n" -write "Expect: 100-continue\r\n" -write "\r\n" -write ">|<" -write notify DOWNSTREAM_REQUESTED - -read await DOWNSTREAM_REQUESTED -read "HTTP/1.1 200 OK\r\n" -read "Cache-Control: private\r\n" -read "Connection: close\r\n" -read "Content-Type: application/octet-stream\r\n" -read /Date: .*\r\n/ -read "Server: Kaazing Gateway\r\n" -read "X-Content-Type-Options: nosniff\r\n" -read "\r\n" -read "HTTP/1.1 200 OK\r\n" -read "Content-Type: application/octet-stream\r\n" -read "X-Idle-Timeout: 5\r\n" -read "\r\n" -read [0x01 0x30 0x30 0xff] # NO-OP -read [0x01] -# Padding to 2048 bytes (0 is 0x30). The following line does not work unfortunately: -# read /0*/ "0" -read [0..2044] -read [0xff] -read [0x89 0x00] # ping -read notify PING_RECEIVED -read await PONG_REPLY_SENT -read [0x89 0x00] # ping - -read notify SESSION_ESTABLISHED - -write await READ_LATENCY_ATTRIBUTES - -write "POST /;post" -write ${up} -write " HTTP/1.1\r\n" -write "Content-Type: application/octet-stream\r\n" -write "X-WebSocket-Version: wseb-1.0\r\n" -write "X-Origin: privileged://localhost:8123\r\n" -write "X-Origin-privileged%3A%2F%2Flocalhost%3A8123: privileged://localhost:8123\r\n" -write "Host: localhost:8123\r\n" -write "Content-Length: 6\r\n" -write "Expect: 100-continue\r\n" -write "Connection: Close\r\n" -write "\r\n" -write [0x8a 0x00] # pong -write [0x01 0x30 0x31 0xff] # reconnect - -closed From 3cacd623cae9b4f152bbb1dbb2deaf92324a5256 Mon Sep 17 00:00:00 2001 From: vmaraloiu Date: Wed, 25 Jan 2017 17:38:17 +0200 Subject: [PATCH 41/53] Fix test and remove throw protocol decoder exception. --- .../http/bridge/filter/HttpRequestDecodingState.java | 4 +--- .../http/acceptor/specification/rfc7230/MessageFormatIT.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/transport/http/src/main/java/org/kaazing/gateway/transport/http/bridge/filter/HttpRequestDecodingState.java b/transport/http/src/main/java/org/kaazing/gateway/transport/http/bridge/filter/HttpRequestDecodingState.java index 3871cc7f6e..9a8ba2c6fe 100644 --- a/transport/http/src/main/java/org/kaazing/gateway/transport/http/bridge/filter/HttpRequestDecodingState.java +++ b/transport/http/src/main/java/org/kaazing/gateway/transport/http/bridge/filter/HttpRequestDecodingState.java @@ -245,9 +245,7 @@ private boolean isChunked(HttpRequestMessage httpRequest) if ("chunked".equalsIgnoreCase(transferEncoding)) { return true; - } - - throw new ProtocolDecoderException("Unexpected transfer coding: " + transferEncoding); + } } return false; diff --git a/transport/http/src/test/java/org/kaazing/gateway/transport/http/acceptor/specification/rfc7230/MessageFormatIT.java b/transport/http/src/test/java/org/kaazing/gateway/transport/http/acceptor/specification/rfc7230/MessageFormatIT.java index 19a775d858..e1cabab0bd 100644 --- a/transport/http/src/test/java/org/kaazing/gateway/transport/http/acceptor/specification/rfc7230/MessageFormatIT.java +++ b/transport/http/src/test/java/org/kaazing/gateway/transport/http/acceptor/specification/rfc7230/MessageFormatIT.java @@ -255,7 +255,6 @@ protected void doSessionOpened(HttpAcceptSession session) throws Exception { assertTrue(latch.await(4, SECONDS)); } - @Ignore("Transfer Encoding Bug") @Test @Specification({"server.should.send.501.to.unknown.transfer.encoding/request"}) public void serverShouldSend501ToUnknownTransferEncoding() throws Exception { @@ -265,7 +264,7 @@ public void serverShouldSend501ToUnknownTransferEncoding() throws Exception { @Override protected void doSessionOpened(HttpAcceptSession session) throws Exception { latch.countDown(); - session.setStatus(HttpStatus.SUCCESS_OK); + session.setStatus(HttpStatus.SERVER_NOT_IMPLEMENTED); session.close(true); } }; From eb70f1e88e47235c4514867312a0fafd2b3e1de1 Mon Sep 17 00:00:00 2001 From: vmaraloiu Date: Thu, 26 Jan 2017 17:44:43 +0200 Subject: [PATCH 42/53] Remove constants from org.kaazing.gateway.server.Gateway. --- .../java/org/kaazing/gateway/server/Gateway.java | 16 ---------------- .../kaazing/gateway/server/impl/GatewayImpl.java | 8 +------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/server.api/src/main/java/org/kaazing/gateway/server/Gateway.java b/server.api/src/main/java/org/kaazing/gateway/server/Gateway.java index bb17dc8349..f66e1e4521 100644 --- a/server.api/src/main/java/org/kaazing/gateway/server/Gateway.java +++ b/server.api/src/main/java/org/kaazing/gateway/server/Gateway.java @@ -89,11 +89,6 @@ public interface Gateway { */ String GATEWAY_USER_LIB_DIRECTORY_PROPERTY = "GATEWAY_USER_LIB_DIRECTORY"; - /** - * private property - */ - String BYPASS_PLATFORM_CHECK_PROPERTY = "bypassPlatformCheck"; - /** * The fully qualified path to a Log4J configuration file. See http://logging.apache.org/log4j/ for more information * about configuring Log4J. By default, the Gateway will look for log4j-config.xml in this directory. @@ -117,17 +112,6 @@ public interface Gateway { */ String LOG4J_CONFIG_REFRESH_INTERVAL = "LOG4J_CONFIG_REFRESH_INTERVAL"; - String TCP_BACKLOG = "org.kaazing.gateway.server.transport.tcp.BACKLOG"; - String TCP_MAXIMUM_READ_BUFFER_SIZE = "org.kaazing.gateway.server.transport.tcp.MAXIMUM_READ_BUFFER_SIZE"; - String TCP_MINIMUM_READ_BUFFER_SIZE = "org.kaazing.gateway.server.transport.tcp.MINIMUM_READ_BUFFER_SIZE"; - String TCP_NO_DELAY = "org.kaazing.gateway.server.transport.tcp.TCP_NO_DELAY"; - String TCP_PROCESSOR_COUNT = "org.kaazing.gateway.server.transport.tcp.PROCESSOR_COUNT"; - String TCP_READ_BUFFER_SIZE = "org.kaazing.gateway.server.transport.tcp.READ_BUFFER_SIZE"; - String TCP_WRITE_TIMEOUT = "org.kaazing.gateway.server.transport.tcp.WRITE_TIMEOUT"; - String UDP_MAXIMUM_READ_BUFFER_SIZE = "org.kaazing.gateway.server.transport.udp.MAXIMUM_READ_BUFFER_SIZE"; - String UDP_MINIMUM_READ_BUFFER_SIZE = "org.kaazing.gateway.server.transport.udp.MINIMUM_READ_BUFFER_SIZE"; - String UDP_READ_BUFFER_SIZE = "org.kaazing.gateway.server.transport.udp.READ_BUFFER_SIZE"; - /** * Set up the Gateway with the given properties. Example of properties used by the Gateway are GATEWAY_HOME and * GATEWAY_CONFIG. The gateway-config.xml configuration file also specifies property names and values that can diff --git a/server/src/main/java/org/kaazing/gateway/server/impl/GatewayImpl.java b/server/src/main/java/org/kaazing/gateway/server/impl/GatewayImpl.java index 92f68716d4..866186fabf 100644 --- a/server/src/main/java/org/kaazing/gateway/server/impl/GatewayImpl.java +++ b/server/src/main/java/org/kaazing/gateway/server/impl/GatewayImpl.java @@ -166,13 +166,7 @@ public void launch() throws Exception { throw new Exception("No environment has been specified"); } - String bypassPlatformCheckStr = configuration.getProperty(BYPASS_PLATFORM_CHECK_PROPERTY); - boolean bypassPlatformCheck = bypassPlatformCheckStr != null && - !bypassPlatformCheckStr.equalsIgnoreCase("false") && - !bypassPlatformCheckStr.equalsIgnoreCase("no") && - !bypassPlatformCheckStr.equalsIgnoreCase("n"); - - if (!bypassPlatformCheck && !supportedJavaVersion(1, 8, "0")) { + if (!supportedJavaVersion(1, 8, "0")) { throw new RuntimeException("Unsupported JDK version, Please install Java SE 8.0 or later and relaunch " + "Kaazing WebSocket Gateway"); } From 90bc14664b41c0f213846d31ec3cfc2afeefb2be Mon Sep 17 00:00:00 2001 From: Costin Chiriac Date: Tue, 31 Jan 2017 17:01:02 +0200 Subject: [PATCH 43/53] Reverted shade plugin to generate the reduced pom. Added hidden dependencies from mina.netty as dependencies in distribution. --- distribution/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++ mina.netty/pom.xml | 3 ++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index b99c4a14aa..5e33a0ed39 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -211,6 +211,52 @@ org.kaazing gateway.service.turn.rest + + + + + io.netty + netty + 3.10.5.Final + + + org.kaazing + mina-core + ${project.version} + + + org.kaazing + mina-integration-beans + ${project.version} + + + org.kaazing + mina-core + + + + + org.kaazing + mina-integration-jmx + ${project.version} + + + org.kaazing + mina-core + + + + + org.kaazing + mina-integration-ognl + ${project.version} + + + org.kaazing + mina-core + + + diff --git a/mina.netty/pom.xml b/mina.netty/pom.xml index 81f218f6ab..d1fb7c4f79 100644 --- a/mina.netty/pom.xml +++ b/mina.netty/pom.xml @@ -194,7 +194,8 @@ maven-shade-plugin 2.4.2 - false + + ${basedir}/target/dependency-reduced-pom.xml ${create.shaded.sources} From ad555768669ad473a3b366b0016b68cdaf1abe0c Mon Sep 17 00:00:00 2001 From: vmaraloiu Date: Thu, 2 Feb 2017 15:28:49 +0200 Subject: [PATCH 44/53] Clean up system property. --- .../service/broadcast/BroadcastService.java | 18 ++-- .../http/proxy/HttpProxyPersistenceTest.java | 3 +- .../transport/nio/NioSystemProperty.java | 89 ------------------- .../nio/internal/AbstractNioAcceptor.java | 2 +- .../nio/internal/NioDatagramAcceptor.java | 9 +- .../nio/internal/NioSocketAcceptor.java | 28 +++--- .../nio/internal/NioSocketConnector.java | 18 ++-- .../nio/internal/NioSocketAcceptorTest.java | 4 +- .../nio/internal/TcpIdleTimeoutIT.java | 2 +- .../gateway/transport/udp/UdpAcceptorBM.java | 2 +- .../udp/specification/UdpAcceptorIT.java | 2 +- .../transport/InternalSystemProperty.java | 61 ------------- .../gateway/transport/ws/WsAcceptor.java | 2 +- .../transport/ws/WsSystemProperty.java | 2 + .../gateway/transport/ws/WsAcceptorTest.java | 3 +- .../transport/wseb/WsebTransportIT.java | 4 +- .../gateway/util/InternalSystemProperty.java | 9 +- 17 files changed, 60 insertions(+), 198 deletions(-) delete mode 100644 transport/nio/src/main/java/org/kaazing/gateway/transport/nio/NioSystemProperty.java delete mode 100644 transport/spi/src/main/java/org/kaazing/gateway/transport/InternalSystemProperty.java diff --git a/service/broadcast/src/main/java/org/kaazing/gateway/service/broadcast/BroadcastService.java b/service/broadcast/src/main/java/org/kaazing/gateway/service/broadcast/BroadcastService.java index 7f246c6317..63897e02a6 100644 --- a/service/broadcast/src/main/java/org/kaazing/gateway/service/broadcast/BroadcastService.java +++ b/service/broadcast/src/main/java/org/kaazing/gateway/service/broadcast/BroadcastService.java @@ -15,9 +15,9 @@ */ package org.kaazing.gateway.service.broadcast; -// FIXME: Make InternalSystemProperty generic, maybe gateway.util? -//import static org.kaazing.gateway.server.config.InternalSystemProperty.BROADCAST_SERVICE_DISCONNECT_CLIENTS_ON_RECONNECT; -//import static org.kaazing.gateway.server.config.InternalSystemProperty.BROADCAST_SERVICE_MAXIMUM_PENDING_BYTES; +import static org.kaazing.gateway.util.InternalSystemProperty.BROADCAST_SERVICE_DISCONNECT_CLIENTS_ON_RECONNECT; +import static org.kaazing.gateway.util.InternalSystemProperty.BROADCAST_SERVICE_MAXIMUM_PENDING_BYTES; + import static org.kaazing.gateway.util.Utils.parseBoolean; import static org.kaazing.gateway.util.Utils.parsePositiveInteger; @@ -52,8 +52,6 @@ public class BroadcastService implements Service { // FIXME: remove me // services - private static final String BROADCAST_SERVICE_MAXIMUM_PENDING_BYTES = "org.kaazing.gateway.server.service.broadcast.MAXIMUM_PENDING_BYTES"; - private static final String BROADCAST_SERVICE_DISCONNECT_CLIENTS_ON_RECONNECT = "org.kaazing.gateway.server.service.broadcast.DISCONNECT_CLIENTS_ON_RECONNECT"; // true or false private static final String ON_CLIENT_MESSAGE = "on.client.message"; // FIXME: end of remove me @@ -93,15 +91,13 @@ public void init(final ServiceContext serviceContext) throws Exception { this.serviceContext = serviceContext; boolean disconnectClientsOnReconnect = parseBoolean( - BROADCAST_SERVICE_DISCONNECT_CLIENTS_ON_RECONNECT, -// BROADCAST_SERVICE_DISCONNECT_CLIENTS_ON_RECONNECT.getPropertyName(), - configuration.getProperty(BROADCAST_SERVICE_DISCONNECT_CLIENTS_ON_RECONNECT), + BROADCAST_SERVICE_DISCONNECT_CLIENTS_ON_RECONNECT.getPropertyName(), + configuration.getProperty(BROADCAST_SERVICE_DISCONNECT_CLIENTS_ON_RECONNECT.getPropertyName()), // BROADCAST_SERVICE_DISCONNECT_CLIENTS_ON_RECONNECT.getProperty(configuration), false); long maximumScheduledWriteBytes = parsePositiveInteger( - BROADCAST_SERVICE_MAXIMUM_PENDING_BYTES, -// BROADCAST_SERVICE_MAXIMUM_PENDING_BYTES.getPropertyName(), - configuration.getProperty(BROADCAST_SERVICE_MAXIMUM_PENDING_BYTES), + BROADCAST_SERVICE_MAXIMUM_PENDING_BYTES.getPropertyName(), + configuration.getProperty(BROADCAST_SERVICE_MAXIMUM_PENDING_BYTES.getPropertyName()), // BROADCAST_SERVICE_MAXIMUM_PENDING_BYTES.getProperty(configuration), Long.MAX_VALUE); OnClientMessage onClientMessage = OnClientMessage.fromString(serviceContext.getProperties().get(ON_CLIENT_MESSAGE)); diff --git a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyPersistenceTest.java b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyPersistenceTest.java index 90bc02ef26..4e6e3df3f1 100644 --- a/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyPersistenceTest.java +++ b/service/http.proxy/src/test/java/org/kaazing/gateway/service/http/proxy/HttpProxyPersistenceTest.java @@ -35,6 +35,7 @@ import org.kaazing.gateway.server.test.config.builder.GatewayConfigurationBuilder; import org.kaazing.gateway.util.feature.EarlyAccessFeatures; import org.kaazing.test.util.ITUtil; +import static org.kaazing.gateway.util.InternalSystemProperty.TCP_PROCESSOR_COUNT; public class HttpProxyPersistenceTest { @@ -58,7 +59,7 @@ public void maxPersistentIdleConnections() throws Exception { .connectOption("http.keepalive.timeout", String.valueOf(KEEP_ALIVE_TIMEOUT)) .connectOption("http.keepalive.connections", String.valueOf(KEEP_ALIVE_CONNECTIONS)) .done() - .property("org.kaazing.gateway.server.transport.tcp.PROCESSOR_COUNT", "1") + .property(TCP_PROCESSOR_COUNT.getPropertyName(), "1") .done(); // @formatter:on diff --git a/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/NioSystemProperty.java b/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/NioSystemProperty.java deleted file mode 100644 index 28f9ca3e20..0000000000 --- a/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/NioSystemProperty.java +++ /dev/null @@ -1,89 +0,0 @@ -/** - * Copyright 2007-2016, Kaazing Corporation. 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. - */ -package org.kaazing.gateway.transport.nio; - -import static java.lang.Integer.parseInt; -import static java.lang.Runtime.getRuntime; - -import java.util.Properties; - -public enum NioSystemProperty { - - // TODO: eliminate all use of System.getProperty and pull all used properties into this class - // (e.g. in NioSocketAcceptor) - - // Keeping the c.k.g.server.transport for the property names for backward compatibility - - // transports - DEBUG_NIOWORKER_POOL("NioWorkerPool.DEBUG"), // true or false - // We are deliberately changing the default that Netty uses (availableProcessors() * 2 ): - TCP_PROCESSOR_COUNT("org.kaazing.gateway.server.transport.tcp.PROCESSOR_COUNT", Integer.toString(getRuntime().availableProcessors())), - - // These Buffer sizes were used by Mina. I'm pretty sure they no longer apply. - TCP_READ_BUFFER_SIZE("org.kaazing.gateway.server.transport.tcp.READ_BUFFER_SIZE"), - TCP_MINIMUM_READ_BUFFER_SIZE("org.kaazing.gateway.server.transport.tcp.MINIMUM_READ_BUFFER_SIZE"), - TCP_MAXIMUM_READ_BUFFER_SIZE("org.kaazing.gateway.server.transport.tcp.MAXIMUM_READ_BUFFER_SIZE"), - TCP_WRITE_TIMEOUT("org.kaazing.gateway.server.transport.tcp.WRITE_TIMEOUT"), - - // Socket Channel Config options (SocketChannelIoSessionConfig) - TCP_REUSE_ADDRESS("org.kaazing.gateway.server.transport.tcp.REUSE_ADDRESS", "true"), - TCP_NO_DELAY("org.kaazing.gateway.server.transport.tcp.TCP_NO_DELAY"), - TCP_BACKLOG("org.kaazing.gateway.server.transport.tcp.BACKLOG"), - TCP_KEEP_ALIVE("org.kaazing.gateway.server.transport.tcp.KEEP_ALIVE"), - TCP_RECEIVE_BUFFER_SIZE("org.kaazing.gateway.server.transport.tcp.RECEIVE_BUFFER_SIZE"), - TCP_SEND_BUFFER_SIZE("org.kaazing.gateway.server.transport.tcp.SEND_BUFFER_SIZE"), - TCP_SO_LINGER("org.kaazing.gateway.server.transport.tcp.SO_LINGER"), - TCP_IP_TOS("org.kaazing.gateway.server.transport.tcp.IP_TOS"), - - // TCP_IDLE_TIMEOUT will kill the session if nothing is written or read at nio level. - // Note, the idle usage is using the mina netty idle timeout which may be set - // by higher layers. Logic for this is in NioIdleFilter - TCP_IDLE_TIMEOUT("org.kaazing.gateway.server.transport.tcp.IDLE_TIMEOUT", Integer.toString(0)), - UDP_IDLE_TIMEOUT("org.kaazing.gateway.server.transport.udp.IDLE_TIMEOUT", "60"); - - private final String name; - private final String defaultValue; - - NioSystemProperty(String propertyName) { - this(propertyName, null); - } - - NioSystemProperty(String name, String defaultValue) { - this.name = name; - this.defaultValue = defaultValue; - } - - public String getProperty(Properties configuration) { - return configuration.getProperty(name, defaultValue); - } - - public Integer getIntProperty(Properties configuration) { - String value = getProperty(configuration); - if (value == null) { - return null; - } - return parseInt(value); - } - - public String getPropertyName() { - return name; - } - - public boolean isSet(Properties configuration) { - return configuration.containsKey(name); - } - -} diff --git a/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/AbstractNioAcceptor.java b/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/AbstractNioAcceptor.java index 51231ea208..3e374516ce 100644 --- a/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/AbstractNioAcceptor.java +++ b/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/AbstractNioAcceptor.java @@ -24,7 +24,7 @@ import static org.kaazing.gateway.transport.BridgeSession.LOCAL_ADDRESS; import static org.kaazing.gateway.transport.BridgeSession.NEXT_PROTOCOL_KEY; import static org.kaazing.gateway.transport.BridgeSession.REMOTE_ADDRESS; -import static org.kaazing.gateway.transport.nio.NioSystemProperty.TCP_IDLE_TIMEOUT; +import static org.kaazing.gateway.util.InternalSystemProperty.TCP_IDLE_TIMEOUT; import java.net.Inet6Address; import java.net.InetAddress; diff --git a/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/NioDatagramAcceptor.java b/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/NioDatagramAcceptor.java index aa8c359bd4..0a777b285d 100644 --- a/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/NioDatagramAcceptor.java +++ b/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/NioDatagramAcceptor.java @@ -15,6 +15,10 @@ */ package org.kaazing.gateway.transport.nio.internal; +import static org.kaazing.gateway.util.InternalSystemProperty.TCP_MINIMUM_READ_BUFFER_SIZE; +import static org.kaazing.gateway.util.InternalSystemProperty.TCP_MAXIMUM_READ_BUFFER_SIZE; +import static org.kaazing.gateway.util.InternalSystemProperty.UDP_IDLE_TIMEOUT; + import org.apache.mina.core.future.IoFuture; import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.session.IdleStatus; @@ -38,7 +42,6 @@ import java.util.Properties; import static java.util.concurrent.Executors.newCachedThreadPool; -import static org.kaazing.gateway.transport.nio.NioSystemProperty.UDP_IDLE_TIMEOUT; public class NioDatagramAcceptor extends AbstractNioAcceptor { @@ -73,13 +76,13 @@ protected IoAcceptorEx initAcceptor(final IoSessionInitializer Date: Fri, 3 Feb 2017 20:35:43 +0000 Subject: [PATCH 45/53] Resolve version ranges for release 5.4.1 --- bridge/gateway.bridge/pom.xml | 2 +- management/pom.xml | 2 +- mina.netty/pom.xml | 2 +- pom.xml | 2 +- server/pom.xml | 6 +++--- service/broadcast/pom.xml | 2 +- service/http.directory/pom.xml | 2 +- service/http.proxy/pom.xml | 2 +- service/turn.rest/pom.xml | 2 +- transport/sse/pom.xml | 2 +- transport/ssl/pom.xml | 2 +- transport/wseb/pom.xml | 2 +- transport/wsn/pom.xml | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bridge/gateway.bridge/pom.xml b/bridge/gateway.bridge/pom.xml index e8cccb530b..d83727a281 100644 --- a/bridge/gateway.bridge/pom.xml +++ b/bridge/gateway.bridge/pom.xml @@ -24,7 +24,7 @@ org.kaazing gateway.client.java.bridge - [5.0.0.0,5.1.0.0) + 5.0.0.5 org.kaazing diff --git a/management/pom.xml b/management/pom.xml index 830fa590ed..f1e4078735 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -170,7 +170,7 @@ org.kaazing gateway.test.ca - [1.0.0.0,1.1.0.0) + 1.0.0.24 keystore test diff --git a/mina.netty/pom.xml b/mina.netty/pom.xml index d1fb7c4f79..a2f50f0d2f 100644 --- a/mina.netty/pom.xml +++ b/mina.netty/pom.xml @@ -72,7 +72,7 @@ junit junit - [4.10,5.0) + 4.12 test diff --git a/pom.xml b/pom.xml index f9afa85509..7d9958b5b4 100644 --- a/pom.xml +++ b/pom.xml @@ -204,7 +204,7 @@ org.kaazing gateway.truststore - [1.0.0.0,1.1.0.0) + 1.0.0.81 jar diff --git a/server/pom.xml b/server/pom.xml index 8b32def620..bcc04db54e 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -208,7 +208,7 @@ junit junit - [4.10,5.0) + 4.12 provided @@ -228,13 +228,13 @@ org.kaazing net.api - [1.1.0.0,1.2.0.0) + 1.1.0.9 test org.kaazing gateway.test.ca - [1.0.0.0,1.1.0.0) + 1.0.0.24 keystore test diff --git a/service/broadcast/pom.xml b/service/broadcast/pom.xml index 835c3f19e8..0d3bfa1332 100644 --- a/service/broadcast/pom.xml +++ b/service/broadcast/pom.xml @@ -81,7 +81,7 @@ org.kaazing gateway.test.ca - [1.0.0.0,1.1.0.0) + 1.0.0.24 keystore test diff --git a/service/http.directory/pom.xml b/service/http.directory/pom.xml index 945eaf6007..a95c8d6d6d 100644 --- a/service/http.directory/pom.xml +++ b/service/http.directory/pom.xml @@ -60,7 +60,7 @@ org.kaazing gateway.test.ca - [1.0.0.0,1.1.0.0) + 1.0.0.24 keystore test diff --git a/service/http.proxy/pom.xml b/service/http.proxy/pom.xml index 46e7f9e85a..ac31f46522 100644 --- a/service/http.proxy/pom.xml +++ b/service/http.proxy/pom.xml @@ -68,7 +68,7 @@ org.kaazing gateway.test.ca - [1.0.0.0,1.1.0.0) + 1.0.0.24 keystore test diff --git a/service/turn.rest/pom.xml b/service/turn.rest/pom.xml index d0c5a8b88a..a770bafa91 100644 --- a/service/turn.rest/pom.xml +++ b/service/turn.rest/pom.xml @@ -61,7 +61,7 @@ org.kaazing gateway.test.ca - [1.0.0.0,1.1.0.0) + 1.0.0.24 keystore test diff --git a/transport/sse/pom.xml b/transport/sse/pom.xml index c108c89ad3..5e2b472525 100644 --- a/transport/sse/pom.xml +++ b/transport/sse/pom.xml @@ -94,7 +94,7 @@ org.kaazing gateway.test.ca - [1.0.0.0,1.1.0.0) + 1.0.0.24 keystore test diff --git a/transport/ssl/pom.xml b/transport/ssl/pom.xml index 71f5435e81..174a23adab 100644 --- a/transport/ssl/pom.xml +++ b/transport/ssl/pom.xml @@ -38,7 +38,7 @@ org.kaazing gateway.test.ca - [1.0.0.0,1.1.0.0) + 1.0.0.24 keystore test diff --git a/transport/wseb/pom.xml b/transport/wseb/pom.xml index 0f2d04d533..ebe5de3688 100644 --- a/transport/wseb/pom.xml +++ b/transport/wseb/pom.xml @@ -118,7 +118,7 @@ org.kaazing gateway.test.ca - [1.0.0.0,1.1.0.0) + 1.0.0.24 keystore test diff --git a/transport/wsn/pom.xml b/transport/wsn/pom.xml index 782db03c45..8d6c7a820b 100644 --- a/transport/wsn/pom.xml +++ b/transport/wsn/pom.xml @@ -134,7 +134,7 @@ org.kaazing gateway.test.ca - [1.0.0.0,1.1.0.0) + 1.0.0.24 keystore test From 5523b7a1b3858dde5444d8476afff20a47b8eddb Mon Sep 17 00:00:00 2001 From: Kaazing build Date: Fri, 3 Feb 2017 20:36:03 +0000 Subject: [PATCH 46/53] Prepare release 5.4.1 --- bom/pom.xml | 2 +- bridge/gateway.bridge/pom.xml | 2 +- bridge/gateway.client.javascript.bridge/pom.xml | 2 +- bridge/pom.xml | 2 +- distribution/pom.xml | 2 +- management/pom.xml | 2 +- mina.core/core/pom.xml | 2 +- mina.core/integration-beans/pom.xml | 2 +- mina.core/integration-jmx/pom.xml | 2 +- mina.core/integration-ognl/pom.xml | 2 +- mina.core/legal/pom.xml | 2 +- mina.core/parent/pom.xml | 2 +- mina.core/pom.xml | 2 +- mina.core/transport-serial/pom.xml | 2 +- mina.netty/pom.xml | 2 +- pom.xml | 2 +- resource.address/http/pom.xml | 2 +- resource.address/httpx/pom.xml | 2 +- resource.address/httpxdraft/pom.xml | 2 +- resource.address/httpxe/pom.xml | 2 +- resource.address/pipe/pom.xml | 2 +- resource.address/rtmp/pom.xml | 2 +- resource.address/spi/pom.xml | 2 +- resource.address/sse/pom.xml | 2 +- resource.address/ssl/pom.xml | 2 +- resource.address/tcp/pom.xml | 2 +- resource.address/udp/pom.xml | 2 +- resource.address/ws/pom.xml | 2 +- resource.address/wsdraft/pom.xml | 2 +- resource.address/wse/pom.xml | 2 +- resource.address/wsn/pom.xml | 2 +- resource.address/wsx/pom.xml | 2 +- resource.address/wsxdraft/pom.xml | 2 +- security/pom.xml | 2 +- server.api/pom.xml | 2 +- server.spi/pom.xml | 2 +- server/pom.xml | 2 +- service/amqp/pom.xml | 2 +- service/broadcast/pom.xml | 2 +- service/echo/pom.xml | 2 +- service/http.balancer/pom.xml | 2 +- service/http.directory/pom.xml | 2 +- service/http.proxy/pom.xml | 2 +- service/proxy/pom.xml | 2 +- service/spi/pom.xml | 2 +- service/turn.rest/pom.xml | 2 +- service/update.check.management/pom.xml | 2 +- service/update.check/pom.xml | 2 +- test.util/pom.xml | 2 +- transport/bio/pom.xml | 2 +- transport/http/pom.xml | 2 +- transport/nio/pom.xml | 2 +- transport/pipe/pom.xml | 2 +- transport/spi/pom.xml | 2 +- transport/sse/pom.xml | 2 +- transport/ssl/pom.xml | 2 +- transport/ws/pom.xml | 2 +- transport/wseb/pom.xml | 2 +- transport/wsn/pom.xml | 2 +- util/pom.xml | 2 +- 60 files changed, 60 insertions(+), 60 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index d0ff23c9c5..6d20b2a6d8 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 gateway.bom diff --git a/bridge/gateway.bridge/pom.xml b/bridge/gateway.bridge/pom.xml index d83727a281..234c685268 100644 --- a/bridge/gateway.bridge/pom.xml +++ b/bridge/gateway.bridge/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway.bridge.parent - develop-SNAPSHOT + 5.4.1-RC000 gateway.bridge diff --git a/bridge/gateway.client.javascript.bridge/pom.xml b/bridge/gateway.client.javascript.bridge/pom.xml index 8a4e1edad8..9048c71e0d 100644 --- a/bridge/gateway.client.javascript.bridge/pom.xml +++ b/bridge/gateway.client.javascript.bridge/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway.bridge.parent - develop-SNAPSHOT + 5.4.1-RC000 gateway.client.javascript.bridge diff --git a/bridge/pom.xml b/bridge/pom.xml index 35afac030b..23fb601624 100644 --- a/bridge/pom.xml +++ b/bridge/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 gateway.bridge.parent diff --git a/distribution/pom.xml b/distribution/pom.xml index 5e33a0ed39..1430a1080f 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 gateway.distribution diff --git a/management/pom.xml b/management/pom.xml index f1e4078735..b5f33cea06 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 gateway.management diff --git a/mina.core/core/pom.xml b/mina.core/core/pom.xml index e9b3e8e894..191a1d9175 100644 --- a/mina.core/core/pom.xml +++ b/mina.core/core/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - develop-SNAPSHOT + 5.4.1-RC000 ../parent diff --git a/mina.core/integration-beans/pom.xml b/mina.core/integration-beans/pom.xml index 5b4d4216dc..6ea0718329 100644 --- a/mina.core/integration-beans/pom.xml +++ b/mina.core/integration-beans/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - develop-SNAPSHOT + 5.4.1-RC000 ../parent diff --git a/mina.core/integration-jmx/pom.xml b/mina.core/integration-jmx/pom.xml index e03d81951d..b3f082019d 100644 --- a/mina.core/integration-jmx/pom.xml +++ b/mina.core/integration-jmx/pom.xml @@ -6,7 +6,7 @@ org.kaazing mina-parent - develop-SNAPSHOT + 5.4.1-RC000 ../parent mina-integration-jmx diff --git a/mina.core/integration-ognl/pom.xml b/mina.core/integration-ognl/pom.xml index 64827ea660..128ff84aa4 100644 --- a/mina.core/integration-ognl/pom.xml +++ b/mina.core/integration-ognl/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - develop-SNAPSHOT + 5.4.1-RC000 ../parent diff --git a/mina.core/legal/pom.xml b/mina.core/legal/pom.xml index 2cf3813d08..4865302ff9 100644 --- a/mina.core/legal/pom.xml +++ b/mina.core/legal/pom.xml @@ -4,7 +4,7 @@ org.kaazing mina-build - develop-SNAPSHOT + 5.4.1-RC000 mina-legal diff --git a/mina.core/parent/pom.xml b/mina.core/parent/pom.xml index 6122143759..4a5c05a6a3 100644 --- a/mina.core/parent/pom.xml +++ b/mina.core/parent/pom.xml @@ -4,7 +4,7 @@ org.kaazing mina-build - develop-SNAPSHOT + 5.4.1-RC000 mina-parent diff --git a/mina.core/pom.xml b/mina.core/pom.xml index f2c5744848..1d9905e8fc 100644 --- a/mina.core/pom.xml +++ b/mina.core/pom.xml @@ -7,7 +7,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 mina-build diff --git a/mina.core/transport-serial/pom.xml b/mina.core/transport-serial/pom.xml index cb1311f00b..9ae07d2d06 100644 --- a/mina.core/transport-serial/pom.xml +++ b/mina.core/transport-serial/pom.xml @@ -6,7 +6,7 @@ org.kaazing mina-parent - develop-SNAPSHOT + 5.4.1-RC000 diff --git a/mina.netty/pom.xml b/mina.netty/pom.xml index a2f50f0d2f..d668e8bf24 100644 --- a/mina.netty/pom.xml +++ b/mina.netty/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 mina.netty jar diff --git a/pom.xml b/pom.xml index 7d9958b5b4..5598111225 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ gateway Kaazing Gateway - develop-SNAPSHOT + 5.4.1-RC000 pom https://github.com/kaazing/gateway diff --git a/resource.address/http/pom.xml b/resource.address/http/pom.xml index 2e15ba644d..67e3533c37 100644 --- a/resource.address/http/pom.xml +++ b/resource.address/http/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/httpx/pom.xml b/resource.address/httpx/pom.xml index 18844897b3..127f332192 100644 --- a/resource.address/httpx/pom.xml +++ b/resource.address/httpx/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/httpxdraft/pom.xml b/resource.address/httpxdraft/pom.xml index e56a0fa25a..5bde95c2f2 100644 --- a/resource.address/httpxdraft/pom.xml +++ b/resource.address/httpxdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/httpxe/pom.xml b/resource.address/httpxe/pom.xml index 32c654f14c..9b46e48178 100644 --- a/resource.address/httpxe/pom.xml +++ b/resource.address/httpxe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/pipe/pom.xml b/resource.address/pipe/pom.xml index 23e67c0720..cd2c146f6d 100644 --- a/resource.address/pipe/pom.xml +++ b/resource.address/pipe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/rtmp/pom.xml b/resource.address/rtmp/pom.xml index 467542884c..9be5bb60ff 100644 --- a/resource.address/rtmp/pom.xml +++ b/resource.address/rtmp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/spi/pom.xml b/resource.address/spi/pom.xml index 0125ad02e8..844f0aedfa 100644 --- a/resource.address/spi/pom.xml +++ b/resource.address/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/sse/pom.xml b/resource.address/sse/pom.xml index ecc0679c85..5a94aeb2bf 100644 --- a/resource.address/sse/pom.xml +++ b/resource.address/sse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/ssl/pom.xml b/resource.address/ssl/pom.xml index c108623a17..7b4d093adc 100644 --- a/resource.address/ssl/pom.xml +++ b/resource.address/ssl/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/tcp/pom.xml b/resource.address/tcp/pom.xml index ff80ae7964..a414ff6a27 100644 --- a/resource.address/tcp/pom.xml +++ b/resource.address/tcp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/udp/pom.xml b/resource.address/udp/pom.xml index 8f1bbe3b70..2c4d9814d7 100644 --- a/resource.address/udp/pom.xml +++ b/resource.address/udp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/ws/pom.xml b/resource.address/ws/pom.xml index 345663ab87..4625836df5 100644 --- a/resource.address/ws/pom.xml +++ b/resource.address/ws/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/wsdraft/pom.xml b/resource.address/wsdraft/pom.xml index 6e924d1b59..2861074efe 100644 --- a/resource.address/wsdraft/pom.xml +++ b/resource.address/wsdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/wse/pom.xml b/resource.address/wse/pom.xml index 7b044d4cf8..d357f76b2f 100644 --- a/resource.address/wse/pom.xml +++ b/resource.address/wse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.resource.address.wse diff --git a/resource.address/wsn/pom.xml b/resource.address/wsn/pom.xml index dc9ff1e99a..f19cc93d3e 100644 --- a/resource.address/wsn/pom.xml +++ b/resource.address/wsn/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/wsx/pom.xml b/resource.address/wsx/pom.xml index 7c05fe686a..2fc3c6c079 100644 --- a/resource.address/wsx/pom.xml +++ b/resource.address/wsx/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml diff --git a/resource.address/wsxdraft/pom.xml b/resource.address/wsxdraft/pom.xml index 4e0d44464d..2ab26fc5f5 100644 --- a/resource.address/wsxdraft/pom.xml +++ b/resource.address/wsxdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.resource.address.wsxdraft diff --git a/security/pom.xml b/security/pom.xml index 7303fa427d..78a6f353f0 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 gateway.security diff --git a/server.api/pom.xml b/server.api/pom.xml index 6687b49e8a..bb761fd136 100644 --- a/server.api/pom.xml +++ b/server.api/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 gateway.server.api diff --git a/server.spi/pom.xml b/server.spi/pom.xml index 9b0273b3dc..82028b90d2 100644 --- a/server.spi/pom.xml +++ b/server.spi/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 gateway.server.spi diff --git a/server/pom.xml b/server/pom.xml index bcc04db54e..5781055a4f 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 gateway.server Kaazing WebSocket Gateway - Server diff --git a/service/amqp/pom.xml b/service/amqp/pom.xml index c4d19d07ea..09757e6d54 100644 --- a/service/amqp/pom.xml +++ b/service/amqp/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml 4.0.0 diff --git a/service/broadcast/pom.xml b/service/broadcast/pom.xml index 0d3bfa1332..3c882f30e4 100644 --- a/service/broadcast/pom.xml +++ b/service/broadcast/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.service.broadcast diff --git a/service/echo/pom.xml b/service/echo/pom.xml index c21c22c0ce..39c970ebe2 100644 --- a/service/echo/pom.xml +++ b/service/echo/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.service.echo diff --git a/service/http.balancer/pom.xml b/service/http.balancer/pom.xml index 3e669bb8e1..2fabd107ac 100644 --- a/service/http.balancer/pom.xml +++ b/service/http.balancer/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.service.http.balancer diff --git a/service/http.directory/pom.xml b/service/http.directory/pom.xml index a95c8d6d6d..a3f76d479a 100644 --- a/service/http.directory/pom.xml +++ b/service/http.directory/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.service.http.directory diff --git a/service/http.proxy/pom.xml b/service/http.proxy/pom.xml index ac31f46522..d7f3fcab7e 100644 --- a/service/http.proxy/pom.xml +++ b/service/http.proxy/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.service.http.proxy diff --git a/service/proxy/pom.xml b/service/proxy/pom.xml index be9cad819d..69fb2a5d0b 100644 --- a/service/proxy/pom.xml +++ b/service/proxy/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.service.proxy diff --git a/service/spi/pom.xml b/service/spi/pom.xml index 0d8c5d0b83..acf2e97bd3 100644 --- a/service/spi/pom.xml +++ b/service/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.service diff --git a/service/turn.rest/pom.xml b/service/turn.rest/pom.xml index a770bafa91..3dd2fec412 100644 --- a/service/turn.rest/pom.xml +++ b/service/turn.rest/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.service.turn.rest diff --git a/service/update.check.management/pom.xml b/service/update.check.management/pom.xml index 6e239feb49..ff75d09dab 100644 --- a/service/update.check.management/pom.xml +++ b/service/update.check.management/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.service.update.check.management diff --git a/service/update.check/pom.xml b/service/update.check/pom.xml index 27c9a815ae..a36f7cbb36 100644 --- a/service/update.check/pom.xml +++ b/service/update.check/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.service.update.check diff --git a/test.util/pom.xml b/test.util/pom.xml index 039798b6ee..109d5b2cf3 100644 --- a/test.util/pom.xml +++ b/test.util/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 test.util diff --git a/transport/bio/pom.xml b/transport/bio/pom.xml index cce3b1df0f..54118d0bc2 100644 --- a/transport/bio/pom.xml +++ b/transport/bio/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.transport.bio diff --git a/transport/http/pom.xml b/transport/http/pom.xml index dc7eddfd7e..8880e0ec7a 100644 --- a/transport/http/pom.xml +++ b/transport/http/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.transport.http diff --git a/transport/nio/pom.xml b/transport/nio/pom.xml index f8c8d7a79f..893b22df5b 100644 --- a/transport/nio/pom.xml +++ b/transport/nio/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.transport.nio diff --git a/transport/pipe/pom.xml b/transport/pipe/pom.xml index db4d4b2332..224aef29bc 100644 --- a/transport/pipe/pom.xml +++ b/transport/pipe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.transport.pipe diff --git a/transport/spi/pom.xml b/transport/spi/pom.xml index 5c0b9d0195..5cb8ed0e69 100644 --- a/transport/spi/pom.xml +++ b/transport/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.transport diff --git a/transport/sse/pom.xml b/transport/sse/pom.xml index 5e2b472525..7a5404b652 100644 --- a/transport/sse/pom.xml +++ b/transport/sse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.transport.sse diff --git a/transport/ssl/pom.xml b/transport/ssl/pom.xml index 174a23adab..ede9027e6f 100644 --- a/transport/ssl/pom.xml +++ b/transport/ssl/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.transport.ssl diff --git a/transport/ws/pom.xml b/transport/ws/pom.xml index a45b774b65..6f40983922 100644 --- a/transport/ws/pom.xml +++ b/transport/ws/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.transport.ws diff --git a/transport/wseb/pom.xml b/transport/wseb/pom.xml index ebe5de3688..f8d1b612cd 100644 --- a/transport/wseb/pom.xml +++ b/transport/wseb/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.transport.wseb diff --git a/transport/wsn/pom.xml b/transport/wsn/pom.xml index 8d6c7a820b..d83d802b12 100644 --- a/transport/wsn/pom.xml +++ b/transport/wsn/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 ../../pom.xml gateway.transport.wsn diff --git a/util/pom.xml b/util/pom.xml index 1066709e67..5682143ea1 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - develop-SNAPSHOT + 5.4.1-RC000 gateway.util Gateway Utils From 2f6f9382163acd38f76a679b0d006e53eda72ee2 Mon Sep 17 00:00:00 2001 From: Kaazing build Date: Mon, 6 Feb 2017 19:54:37 +0000 Subject: [PATCH 47/53] Update version to 5.4.1-RC001 --- bom/pom.xml | 2 +- bridge/gateway.bridge/pom.xml | 2 +- bridge/gateway.client.javascript.bridge/pom.xml | 2 +- bridge/pom.xml | 2 +- distribution/pom.xml | 2 +- management/pom.xml | 2 +- mina.core/core/pom.xml | 2 +- mina.core/integration-beans/pom.xml | 2 +- mina.core/integration-jmx/pom.xml | 2 +- mina.core/integration-ognl/pom.xml | 2 +- mina.core/legal/pom.xml | 2 +- mina.core/parent/pom.xml | 2 +- mina.core/pom.xml | 2 +- mina.core/transport-serial/pom.xml | 2 +- mina.netty/pom.xml | 2 +- pom.xml | 2 +- resource.address/http/pom.xml | 2 +- resource.address/httpx/pom.xml | 2 +- resource.address/httpxdraft/pom.xml | 2 +- resource.address/httpxe/pom.xml | 2 +- resource.address/pipe/pom.xml | 2 +- resource.address/rtmp/pom.xml | 2 +- resource.address/spi/pom.xml | 2 +- resource.address/sse/pom.xml | 2 +- resource.address/ssl/pom.xml | 2 +- resource.address/tcp/pom.xml | 2 +- resource.address/udp/pom.xml | 2 +- resource.address/ws/pom.xml | 2 +- resource.address/wsdraft/pom.xml | 2 +- resource.address/wse/pom.xml | 2 +- resource.address/wsn/pom.xml | 2 +- resource.address/wsx/pom.xml | 2 +- resource.address/wsxdraft/pom.xml | 2 +- security/pom.xml | 2 +- server.api/pom.xml | 2 +- server.spi/pom.xml | 2 +- server/pom.xml | 2 +- service/amqp/pom.xml | 2 +- service/broadcast/pom.xml | 2 +- service/echo/pom.xml | 2 +- service/http.balancer/pom.xml | 2 +- service/http.directory/pom.xml | 2 +- service/http.proxy/pom.xml | 2 +- service/proxy/pom.xml | 2 +- service/spi/pom.xml | 2 +- service/turn.rest/pom.xml | 2 +- service/update.check.management/pom.xml | 2 +- service/update.check/pom.xml | 2 +- test.util/pom.xml | 2 +- transport/bio/pom.xml | 2 +- transport/http/pom.xml | 2 +- transport/nio/pom.xml | 2 +- transport/pipe/pom.xml | 2 +- transport/spi/pom.xml | 2 +- transport/sse/pom.xml | 2 +- transport/ssl/pom.xml | 2 +- transport/ws/pom.xml | 2 +- transport/wseb/pom.xml | 2 +- transport/wsn/pom.xml | 2 +- util/pom.xml | 2 +- 60 files changed, 60 insertions(+), 60 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 6d20b2a6d8..4f178c937c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 gateway.bom diff --git a/bridge/gateway.bridge/pom.xml b/bridge/gateway.bridge/pom.xml index 234c685268..21501fe99a 100644 --- a/bridge/gateway.bridge/pom.xml +++ b/bridge/gateway.bridge/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway.bridge.parent - 5.4.1-RC000 + 5.4.1-RC001 gateway.bridge diff --git a/bridge/gateway.client.javascript.bridge/pom.xml b/bridge/gateway.client.javascript.bridge/pom.xml index 9048c71e0d..18c82f5683 100644 --- a/bridge/gateway.client.javascript.bridge/pom.xml +++ b/bridge/gateway.client.javascript.bridge/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway.bridge.parent - 5.4.1-RC000 + 5.4.1-RC001 gateway.client.javascript.bridge diff --git a/bridge/pom.xml b/bridge/pom.xml index 23fb601624..316bb9a735 100644 --- a/bridge/pom.xml +++ b/bridge/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 gateway.bridge.parent diff --git a/distribution/pom.xml b/distribution/pom.xml index 1430a1080f..59d8eae59d 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 gateway.distribution diff --git a/management/pom.xml b/management/pom.xml index b5f33cea06..fcdbbba866 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 gateway.management diff --git a/mina.core/core/pom.xml b/mina.core/core/pom.xml index 191a1d9175..35736ce6d4 100644 --- a/mina.core/core/pom.xml +++ b/mina.core/core/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - 5.4.1-RC000 + 5.4.1-RC001 ../parent diff --git a/mina.core/integration-beans/pom.xml b/mina.core/integration-beans/pom.xml index 6ea0718329..1e4dd38a1b 100644 --- a/mina.core/integration-beans/pom.xml +++ b/mina.core/integration-beans/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - 5.4.1-RC000 + 5.4.1-RC001 ../parent diff --git a/mina.core/integration-jmx/pom.xml b/mina.core/integration-jmx/pom.xml index b3f082019d..02840d491c 100644 --- a/mina.core/integration-jmx/pom.xml +++ b/mina.core/integration-jmx/pom.xml @@ -6,7 +6,7 @@ org.kaazing mina-parent - 5.4.1-RC000 + 5.4.1-RC001 ../parent mina-integration-jmx diff --git a/mina.core/integration-ognl/pom.xml b/mina.core/integration-ognl/pom.xml index 128ff84aa4..e8d58c9f54 100644 --- a/mina.core/integration-ognl/pom.xml +++ b/mina.core/integration-ognl/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - 5.4.1-RC000 + 5.4.1-RC001 ../parent diff --git a/mina.core/legal/pom.xml b/mina.core/legal/pom.xml index 4865302ff9..371fa89045 100644 --- a/mina.core/legal/pom.xml +++ b/mina.core/legal/pom.xml @@ -4,7 +4,7 @@ org.kaazing mina-build - 5.4.1-RC000 + 5.4.1-RC001 mina-legal diff --git a/mina.core/parent/pom.xml b/mina.core/parent/pom.xml index 4a5c05a6a3..2dd4aaa7d3 100644 --- a/mina.core/parent/pom.xml +++ b/mina.core/parent/pom.xml @@ -4,7 +4,7 @@ org.kaazing mina-build - 5.4.1-RC000 + 5.4.1-RC001 mina-parent diff --git a/mina.core/pom.xml b/mina.core/pom.xml index 1d9905e8fc..4f21b571fe 100644 --- a/mina.core/pom.xml +++ b/mina.core/pom.xml @@ -7,7 +7,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 mina-build diff --git a/mina.core/transport-serial/pom.xml b/mina.core/transport-serial/pom.xml index 9ae07d2d06..2a574ef408 100644 --- a/mina.core/transport-serial/pom.xml +++ b/mina.core/transport-serial/pom.xml @@ -6,7 +6,7 @@ org.kaazing mina-parent - 5.4.1-RC000 + 5.4.1-RC001 diff --git a/mina.netty/pom.xml b/mina.netty/pom.xml index d668e8bf24..22ccf78a49 100644 --- a/mina.netty/pom.xml +++ b/mina.netty/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 mina.netty jar diff --git a/pom.xml b/pom.xml index 5598111225..977053ef11 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ gateway Kaazing Gateway - 5.4.1-RC000 + 5.4.1-RC001 pom https://github.com/kaazing/gateway diff --git a/resource.address/http/pom.xml b/resource.address/http/pom.xml index 67e3533c37..3428c404ac 100644 --- a/resource.address/http/pom.xml +++ b/resource.address/http/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/httpx/pom.xml b/resource.address/httpx/pom.xml index 127f332192..b5578e5983 100644 --- a/resource.address/httpx/pom.xml +++ b/resource.address/httpx/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/httpxdraft/pom.xml b/resource.address/httpxdraft/pom.xml index 5bde95c2f2..6194a7073c 100644 --- a/resource.address/httpxdraft/pom.xml +++ b/resource.address/httpxdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/httpxe/pom.xml b/resource.address/httpxe/pom.xml index 9b46e48178..812e578c2e 100644 --- a/resource.address/httpxe/pom.xml +++ b/resource.address/httpxe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/pipe/pom.xml b/resource.address/pipe/pom.xml index cd2c146f6d..92755272ac 100644 --- a/resource.address/pipe/pom.xml +++ b/resource.address/pipe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/rtmp/pom.xml b/resource.address/rtmp/pom.xml index 9be5bb60ff..dfc24f7e33 100644 --- a/resource.address/rtmp/pom.xml +++ b/resource.address/rtmp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/spi/pom.xml b/resource.address/spi/pom.xml index 844f0aedfa..f8780df526 100644 --- a/resource.address/spi/pom.xml +++ b/resource.address/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/sse/pom.xml b/resource.address/sse/pom.xml index 5a94aeb2bf..91c46ffef1 100644 --- a/resource.address/sse/pom.xml +++ b/resource.address/sse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/ssl/pom.xml b/resource.address/ssl/pom.xml index 7b4d093adc..0ad5eb3192 100644 --- a/resource.address/ssl/pom.xml +++ b/resource.address/ssl/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/tcp/pom.xml b/resource.address/tcp/pom.xml index a414ff6a27..89aa1b5a83 100644 --- a/resource.address/tcp/pom.xml +++ b/resource.address/tcp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/udp/pom.xml b/resource.address/udp/pom.xml index 2c4d9814d7..b5903cfaf6 100644 --- a/resource.address/udp/pom.xml +++ b/resource.address/udp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/ws/pom.xml b/resource.address/ws/pom.xml index 4625836df5..f98532f47c 100644 --- a/resource.address/ws/pom.xml +++ b/resource.address/ws/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/wsdraft/pom.xml b/resource.address/wsdraft/pom.xml index 2861074efe..9828b6d996 100644 --- a/resource.address/wsdraft/pom.xml +++ b/resource.address/wsdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/wse/pom.xml b/resource.address/wse/pom.xml index d357f76b2f..8475b69d4a 100644 --- a/resource.address/wse/pom.xml +++ b/resource.address/wse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.resource.address.wse diff --git a/resource.address/wsn/pom.xml b/resource.address/wsn/pom.xml index f19cc93d3e..26a7d6a5b0 100644 --- a/resource.address/wsn/pom.xml +++ b/resource.address/wsn/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/wsx/pom.xml b/resource.address/wsx/pom.xml index 2fc3c6c079..c5fa3ed00f 100644 --- a/resource.address/wsx/pom.xml +++ b/resource.address/wsx/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml diff --git a/resource.address/wsxdraft/pom.xml b/resource.address/wsxdraft/pom.xml index 2ab26fc5f5..556c655e21 100644 --- a/resource.address/wsxdraft/pom.xml +++ b/resource.address/wsxdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.resource.address.wsxdraft diff --git a/security/pom.xml b/security/pom.xml index 78a6f353f0..4064b19798 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 gateway.security diff --git a/server.api/pom.xml b/server.api/pom.xml index bb761fd136..3b771a51ca 100644 --- a/server.api/pom.xml +++ b/server.api/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 gateway.server.api diff --git a/server.spi/pom.xml b/server.spi/pom.xml index 82028b90d2..0cd99b173c 100644 --- a/server.spi/pom.xml +++ b/server.spi/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 gateway.server.spi diff --git a/server/pom.xml b/server/pom.xml index 5781055a4f..6f89e7e5b0 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 gateway.server Kaazing WebSocket Gateway - Server diff --git a/service/amqp/pom.xml b/service/amqp/pom.xml index 09757e6d54..3597eceae9 100644 --- a/service/amqp/pom.xml +++ b/service/amqp/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml 4.0.0 diff --git a/service/broadcast/pom.xml b/service/broadcast/pom.xml index 3c882f30e4..82eb456915 100644 --- a/service/broadcast/pom.xml +++ b/service/broadcast/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.service.broadcast diff --git a/service/echo/pom.xml b/service/echo/pom.xml index 39c970ebe2..33d78fd633 100644 --- a/service/echo/pom.xml +++ b/service/echo/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.service.echo diff --git a/service/http.balancer/pom.xml b/service/http.balancer/pom.xml index 2fabd107ac..bbdba11e33 100644 --- a/service/http.balancer/pom.xml +++ b/service/http.balancer/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.service.http.balancer diff --git a/service/http.directory/pom.xml b/service/http.directory/pom.xml index a3f76d479a..e618e7c1e3 100644 --- a/service/http.directory/pom.xml +++ b/service/http.directory/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.service.http.directory diff --git a/service/http.proxy/pom.xml b/service/http.proxy/pom.xml index d7f3fcab7e..8d3a30f059 100644 --- a/service/http.proxy/pom.xml +++ b/service/http.proxy/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.service.http.proxy diff --git a/service/proxy/pom.xml b/service/proxy/pom.xml index 69fb2a5d0b..caa1ad19fc 100644 --- a/service/proxy/pom.xml +++ b/service/proxy/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.service.proxy diff --git a/service/spi/pom.xml b/service/spi/pom.xml index acf2e97bd3..ab8d028fc1 100644 --- a/service/spi/pom.xml +++ b/service/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.service diff --git a/service/turn.rest/pom.xml b/service/turn.rest/pom.xml index 3dd2fec412..1e1f1b2516 100644 --- a/service/turn.rest/pom.xml +++ b/service/turn.rest/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.service.turn.rest diff --git a/service/update.check.management/pom.xml b/service/update.check.management/pom.xml index ff75d09dab..710a8b6017 100644 --- a/service/update.check.management/pom.xml +++ b/service/update.check.management/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.service.update.check.management diff --git a/service/update.check/pom.xml b/service/update.check/pom.xml index a36f7cbb36..8aab68d646 100644 --- a/service/update.check/pom.xml +++ b/service/update.check/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.service.update.check diff --git a/test.util/pom.xml b/test.util/pom.xml index 109d5b2cf3..86393f1e78 100644 --- a/test.util/pom.xml +++ b/test.util/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 test.util diff --git a/transport/bio/pom.xml b/transport/bio/pom.xml index 54118d0bc2..70fdbbd46e 100644 --- a/transport/bio/pom.xml +++ b/transport/bio/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.transport.bio diff --git a/transport/http/pom.xml b/transport/http/pom.xml index 8880e0ec7a..98e3015864 100644 --- a/transport/http/pom.xml +++ b/transport/http/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.transport.http diff --git a/transport/nio/pom.xml b/transport/nio/pom.xml index 893b22df5b..93b1e83c52 100644 --- a/transport/nio/pom.xml +++ b/transport/nio/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.transport.nio diff --git a/transport/pipe/pom.xml b/transport/pipe/pom.xml index 224aef29bc..bb8cf52694 100644 --- a/transport/pipe/pom.xml +++ b/transport/pipe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.transport.pipe diff --git a/transport/spi/pom.xml b/transport/spi/pom.xml index 5cb8ed0e69..6189e286bc 100644 --- a/transport/spi/pom.xml +++ b/transport/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.transport diff --git a/transport/sse/pom.xml b/transport/sse/pom.xml index 7a5404b652..f1666b9dc2 100644 --- a/transport/sse/pom.xml +++ b/transport/sse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.transport.sse diff --git a/transport/ssl/pom.xml b/transport/ssl/pom.xml index ede9027e6f..69b6a283db 100644 --- a/transport/ssl/pom.xml +++ b/transport/ssl/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.transport.ssl diff --git a/transport/ws/pom.xml b/transport/ws/pom.xml index 6f40983922..b39f5e2390 100644 --- a/transport/ws/pom.xml +++ b/transport/ws/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.transport.ws diff --git a/transport/wseb/pom.xml b/transport/wseb/pom.xml index f8d1b612cd..7953c9f256 100644 --- a/transport/wseb/pom.xml +++ b/transport/wseb/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.transport.wseb diff --git a/transport/wsn/pom.xml b/transport/wsn/pom.xml index d83d802b12..8c5a76f07a 100644 --- a/transport/wsn/pom.xml +++ b/transport/wsn/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 ../../pom.xml gateway.transport.wsn diff --git a/util/pom.xml b/util/pom.xml index 5682143ea1..8f2efe24a8 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC000 + 5.4.1-RC001 gateway.util Gateway Utils From b4a513b28906d17424f0e9cd521688be4e988326 Mon Sep 17 00:00:00 2001 From: Kaazing build Date: Mon, 6 Feb 2017 20:21:41 +0000 Subject: [PATCH 48/53] Generate CHANGELOG.md for version 5.4.1-RC001 --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97bf71d7fe..c278f03bf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## [5.4.1-RC001](https://github.com/kaazing/gateway/tree/5.4.1-RC001) (2017-02-06) +[Full Changelog](https://github.com/kaazing/gateway/compare/5.4.0...5.4.1-RC001) + +**Merged pull requests:** + +- Clean up system property. [\#865](https://github.com/kaazing/gateway/pull/865) ([vmaraloiu](https://github.com/vmaraloiu)) +- Reverted shade plugin to generate the reduced pom. [\#864](https://github.com/kaazing/gateway/pull/864) ([Anisotrop](https://github.com/Anisotrop)) +- Remove System Properties which should be undocumented from Javadoc [\#860](https://github.com/kaazing/gateway/pull/860) ([vmaraloiu](https://github.com/vmaraloiu)) +- Fix serverShouldSend501ToUnknownTransferEncoding\(\) test. [\#859](https://github.com/kaazing/gateway/pull/859) ([vmaraloiu](https://github.com/vmaraloiu)) +- Removed tests which are implemented in k3po [\#854](https://github.com/kaazing/gateway/pull/854) ([vstratan](https://github.com/vstratan)) +- Added Log warning first time we see Http 1.0. [\#851](https://github.com/kaazing/gateway/pull/851) ([vmaraloiu](https://github.com/vmaraloiu)) +- Added the `aggregate-add-third-party-mojo` plugin [\#812](https://github.com/kaazing/gateway/pull/812) ([mgherghe](https://github.com/mgherghe)) + ## [5.4.0](https://github.com/kaazing/gateway/tree/5.4.0) (2017-01-20) [Full Changelog](https://github.com/kaazing/gateway/compare/5.3.2...5.4.0) From 46629ee4e55c13c5fa0f7f1e5765d68188f01c95 Mon Sep 17 00:00:00 2001 From: sbadugu Date: Wed, 8 Feb 2017 14:38:29 -0800 Subject: [PATCH 49/53] Revert "(#850) Sync'd AbstractIoAcceptor from mina 2.0.16, fixed bind,unbind ordering in AbstractNioAcceptor" This reverts commit a87b1df5a5824a6a7d060d637a44cbe18d8e631e. --- .../mina/core/service/AbstractIoAcceptor.java | 160 +++++++----------- .../core/service/AbstractIoAcceptorEx.java | 24 ++- .../nio/internal/AbstractNioAcceptor.java | 57 +++---- .../nio/internal/NioDatagramAcceptorTest.java | 2 - .../nio/internal/NioSocketAcceptorTest.java | 6 +- 5 files changed, 95 insertions(+), 154 deletions(-) diff --git a/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptor.java b/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptor.java index ab88e9b673..acb1f9f27d 100644 --- a/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptor.java +++ b/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptor.java @@ -36,17 +36,18 @@ /** * A base implementation of {@link IoAcceptor}. * - * @author Apache MINA Project * @org.apache.xbean.XBean */ /* This class (based on the Mina version) is needed for use in ChannelIoAcceptor in order to use our * AbstractIoSessionEx (which requires ChannelIoAcceptor to be derived from our version of AbstractIoService). - * The following changes were made from the version in Mina 2.0.16: + * The following changes were made from the version in Mina 2.0.0-RC1g: * 1. Change package name * 2. Add imports of needed classes from the original package (org.apache.mina.core.service) * 3. Change checkAddressType, bindLock and boundAddresses from private to package-private so they can be used in * AbstractIoAcceptorEx - * 4. Widen scope of bind lock for subclasses. + * 4. Fix apparent Mina bugs in bind and unbind: fire service listeners to indicate service activated or deactivated + * inside the synchronized bindLock block, to avoid possible wrong outcome in case of race between bind and unbind. + * 5. Widen scope of bind lock for subclasses. */ public abstract class AbstractIoAcceptor extends AbstractIoService implements IoAcceptor { @@ -73,7 +74,7 @@ public abstract class AbstractIoAcceptor * null {@link Executor} is provided, a default one will be created using * {@link Executors#newCachedThreadPool()}. * - * @see AbstractIoService#AbstractIoService(IoSessionConfig, Executor) + * {@see AbstractIoService#AbstractIoService(IoSessionConfig, Executor)} * * @param sessionConfig * the default configuration for the managed {@link IoSession} @@ -105,8 +106,7 @@ public SocketAddress getLocalAddress() { @Override public final Set getLocalAddresses() { Set localAddresses = new HashSet<>(); - - synchronized (boundAddresses) { + synchronized (bindLock) { localAddresses.addAll(boundAddresses); } return localAddresses; @@ -146,7 +146,7 @@ public final List getDefaultLocalAddresses() { @Override public final void setDefaultLocalAddresses(List localAddresses) { if (localAddresses == null) { - throw new IllegalArgumentException("localAddresses"); + throw new NullPointerException("localAddresses"); } setDefaultLocalAddresses((Iterable) localAddresses); } @@ -157,29 +157,28 @@ public final void setDefaultLocalAddresses(List localAd @Override public final void setDefaultLocalAddresses(Iterable localAddresses) { if (localAddresses == null) { - throw new IllegalArgumentException("localAddresses"); + throw new NullPointerException("localAddresses"); } synchronized (bindLock) { - synchronized (boundAddresses) { - if (!boundAddresses.isEmpty()) { - throw new IllegalStateException("localAddress can't be set while the acceptor is bound."); - } - - Collection newLocalAddresses = - new ArrayList<>(); - for (SocketAddress a: localAddresses) { - checkAddressType(a); - newLocalAddresses.add(a); - } + if (!boundAddresses.isEmpty()) { + throw new IllegalStateException( + "localAddress can't be set while the acceptor is bound."); + } - if (newLocalAddresses.isEmpty()) { - throw new IllegalArgumentException("empty localAddresses"); - } + Collection newLocalAddresses = + new ArrayList<>(); + for (SocketAddress a: localAddresses) { + checkAddressType(a); + newLocalAddresses.add(a); + } - this.defaultLocalAddresses.clear(); - this.defaultLocalAddresses.addAll(newLocalAddresses); + if (newLocalAddresses.isEmpty()) { + throw new IllegalArgumentException("empty localAddresses"); } + + this.defaultLocalAddresses.clear(); + this.defaultLocalAddresses.addAll(newLocalAddresses); } } @@ -232,7 +231,7 @@ public final void bind() throws IOException { @Override public final void bind(SocketAddress localAddress) throws IOException { if (localAddress == null) { - throw new IllegalArgumentException("localAddress"); + throw new NullPointerException("localAddress"); } List localAddresses = new ArrayList<>(1); @@ -267,11 +266,11 @@ public final void bind(SocketAddress firstLocalAddress, SocketAddress... otherLo @Override public final void bind(Iterable localAddresses) throws IOException { if (isDisposing()) { - throw new IllegalStateException("The Accpetor disposed is being disposed."); + throw new IllegalStateException("Already disposed."); } if (localAddresses == null) { - throw new IllegalArgumentException("localAddresses"); + throw new NullPointerException("localAddresses"); } List localAddressesCopy = new ArrayList<>(); @@ -287,10 +286,8 @@ public final void bind(Iterable localAddresses) throws boolean activate = false; synchronized (bindLock) { - synchronized (boundAddresses) { - if (boundAddresses.isEmpty()) { - activate = true; - } + if (boundAddresses.isEmpty()) { + activate = true; } if (getHandler() == null) { @@ -298,18 +295,13 @@ public final void bind(Iterable localAddresses) throws } try { - Set addresses = bindInternal(localAddressesCopy); - - synchronized (boundAddresses) { - boundAddresses.addAll(addresses); - } + boundAddresses.addAll(bindInternal(localAddressesCopy)); } catch (IOException | RuntimeException e) { throw e; - } catch (Exception e) { + } catch (Throwable e) { throw new RuntimeIoException( "Failed to bind to: " + getLocalAddresses(), e); } - if (activate) { getListeners().fireServiceActivated(); } @@ -331,7 +323,7 @@ public final void unbind() { @Override public final void unbind(SocketAddress localAddress) { if (localAddress == null) { - throw new IllegalArgumentException("localAddress"); + throw new NullPointerException("localAddress"); } List localAddresses = new ArrayList<>(1); @@ -346,10 +338,10 @@ public final void unbind(SocketAddress localAddress) { public final void unbind(SocketAddress firstLocalAddress, SocketAddress... otherLocalAddresses) { if (firstLocalAddress == null) { - throw new IllegalArgumentException("firstLocalAddress"); + throw new NullPointerException("firstLocalAddress"); } if (otherLocalAddresses == null) { - throw new IllegalArgumentException("otherLocalAddresses"); + throw new NullPointerException("otherLocalAddresses"); } List localAddresses = new ArrayList<>(); @@ -364,67 +356,57 @@ public final void unbind(SocketAddress firstLocalAddress, @Override public final void unbind(Iterable localAddresses) { if (localAddresses == null) { - throw new IllegalArgumentException("localAddresses"); + throw new NullPointerException("localAddresses"); } boolean deactivate = false; synchronized (bindLock) { - synchronized (boundAddresses) { - if (boundAddresses.isEmpty()) { - return; - } + if (boundAddresses.isEmpty()) { + return; + } - List localAddressesCopy = new ArrayList<>(); - int specifiedAddressCount = 0; - for (SocketAddress a : localAddresses) { - specifiedAddressCount++; - if (a != null && boundAddresses.contains(a)) { - localAddressesCopy.add(a); - } - } - if (specifiedAddressCount == 0) { - throw new IllegalArgumentException("localAddresses is empty."); + List localAddressesCopy = new ArrayList<>(); + int specifiedAddressCount = 0; + for (SocketAddress a: localAddresses) { + specifiedAddressCount ++; + if (a != null && boundAddresses.contains(a)) { + localAddressesCopy.add(a); } + } + if (specifiedAddressCount == 0) { + throw new IllegalArgumentException("localAddresses is empty."); + } - if (!localAddressesCopy.isEmpty()) { - try { - unbind0(localAddressesCopy); - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new RuntimeIoException( - "Failed to unbind from: " + getLocalAddresses(), e); - } + if (!localAddressesCopy.isEmpty()) { + try { + unbind0(localAddressesCopy); + } catch (RuntimeException e) { + throw e; + } catch (Throwable e) { + throw new RuntimeIoException( + "Failed to unbind from: " + getLocalAddresses(), e); + } - boundAddresses.removeAll(localAddressesCopy); - if (boundAddresses.isEmpty()) { - deactivate = true; - } + boundAddresses.removeAll(localAddressesCopy); + if (boundAddresses.isEmpty()) { + deactivate = true; } } - if (deactivate) { getListeners().fireServiceDeactivated(); } } - } /** * Starts the acceptor, and register the given addresses - * - * @param localAddresses The address to bind to * @return the {@link Set} of the local addresses which is bound actually - * @throws Exception If the bind failed */ protected abstract Set bindInternal( List localAddresses) throws Exception; /** * Implement this method to perform the actual unbind operation. - * - * @param localAddresses The address to unbind from - * @throws Exception If the unbind failed */ protected abstract void unbind0( List localAddresses) throws Exception; @@ -432,13 +414,11 @@ protected abstract void unbind0( @Override public String toString() { TransportMetadata m = getTransportMetadata(); - return '(' - + m.getProviderName() - + ' ' - + m.getName() - + " acceptor: " - + (isActive() ? "localAddress(es): " + getLocalAddresses() + ", managedSessionCount: " - + getManagedSessionCount() : "not bound") + ')'; + return '(' + m.getProviderName() + ' ' + m.getName() + " acceptor: " + + (isActive()? + "localAddress(es): " + getLocalAddresses() + + ", managedSessionCount: " + getManagedSessionCount() : + "not bound") + ')'; } void checkAddressType(SocketAddress a) { @@ -451,24 +431,13 @@ void checkAddressType(SocketAddress a) { } } - /** - * A {@Link IoFuture} - */ public static class AcceptorOperationFuture extends ServiceOperationFuture { private final List localAddresses; - /** - * Creates a new AcceptorOperationFuture instance - * - * @param localAddresses The list of local addresses to listen to - */ public AcceptorOperationFuture(List localAddresses) { this.localAddresses = new ArrayList<>(localAddresses); } - /** - * @return The list of local addresses we listen to - */ public final List getLocalAddresses() { return Collections.unmodifiableList(localAddresses); } @@ -476,7 +445,6 @@ public final List getLocalAddresses() { /** * @see Object#toString() */ - @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptorEx.java b/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptorEx.java index 12060396b7..6543210c6c 100644 --- a/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptorEx.java +++ b/mina.netty/src/main/java/org/kaazing/mina/core/service/AbstractIoAcceptorEx.java @@ -59,7 +59,6 @@ public BindFuture bindAsync(final SocketAddress localAddress) { if (getHandler() == null) { throw new IllegalStateException("handler is not set."); } - BindFuture bound = bindAsyncInternal(localAddress); bound.addListener(new IoFutureListener() { @Override @@ -67,12 +66,10 @@ public void operationComplete(BindFuture future) { if (future.isBound()) { boolean activate = false; synchronized (bindLock) { - synchronized (boundAddresses) { - if (boundAddresses.isEmpty()) { - activate = true; - } - boundAddresses.add(localAddress); + if (boundAddresses.isEmpty()) { + activate = true; } + boundAddresses.add(localAddress); if (activate) { getListeners().fireServiceActivated(); } @@ -93,19 +90,18 @@ public void operationComplete(UnbindFuture future) { if (future.isUnbound()) { boolean deactivate = false; synchronized (bindLock) { - synchronized (boundAddresses) { - if (boundAddresses.isEmpty()) { - return; - } - boundAddresses.remove(localAddress); - if (boundAddresses.isEmpty()) { - deactivate = true; - } + if (boundAddresses.isEmpty()) { + return; + } + boundAddresses.remove(localAddress); + if (boundAddresses.isEmpty()) { + deactivate = true; } if (deactivate) { getListeners().fireServiceDeactivated(); } } + } } }); diff --git a/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/AbstractNioAcceptor.java b/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/AbstractNioAcceptor.java index 3e374516ce..e94a319b11 100644 --- a/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/AbstractNioAcceptor.java +++ b/transport/nio/src/main/java/org/kaazing/gateway/transport/nio/internal/AbstractNioAcceptor.java @@ -37,7 +37,6 @@ import java.util.Properties; import java.util.SortedSet; import java.util.concurrent.ConcurrentSkipListSet; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.FutureTask; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicBoolean; @@ -334,44 +333,28 @@ public void bind(final ResourceAddress address, failedAddress = currentAddress; } - // Asynchronous bind is needed to avoid a Netty error if bind is called from an IO worker thread. - // This can happens from connect in SocksConnector in reverse mode (see KG-7179 for details). - CountDownLatch countDownLatch = new CountDownLatch(1); if (needsAcceptorBind) { - // Scheduling onto unbindScheduler thread so that bind and unbind are ordered - if (!unbindScheduler.isShutdown()) { - final ResourceAddress currentBindAddress = currentAddress; - unbindScheduler.submit(new Runnable() { - @Override - public void run() { - try { - acceptor.bind(socketAddress); - boundAuthorities.add(currentBindAddress); - LOG.info("Bound to resource: " + resource); - } catch(Exception e) { - boolean preferIPv6Stack = "true".equalsIgnoreCase(System.getProperty("java.net.preferIPv6Stack")); - if (!preferIPv6Stack && (e instanceof SocketException) && (socketAddress.getAddress() instanceof Inet6Address)) { - skipIPv6Addresses = true; - } else { - String error = "Unable to bind resource: " + resource + " cause: " + e.getMessage(); - if (LOG.isDebugEnabled()) { - LOG.debug(error, e); - } else { - LOG.error(error + " "+ e.getMessage()); - } - throw new RuntimeException(error); - } - } finally { - countDownLatch.countDown(); - } - + // Asynchronous bind is needed to avoid a Netty error if bind is called from an IO worker thread. + // This can happens from connect in SocksConnector in reverse mode (see KG-7179 for details). + BindFuture bound = acceptor.bindAsync(socketAddress); + bound.awaitUninterruptibly(); + Throwable e = bound.getException(); + if (e != null) { + boolean preferIPv6Stack = "true".equalsIgnoreCase(System.getProperty("java.net.preferIPv6Stack")); + if (!preferIPv6Stack && (e instanceof SocketException) && (socketAddress.getAddress() instanceof Inet6Address)) { + skipIPv6Addresses = true; + } else { + String error = "Unable to bind resource: " + resource + " cause: " + e.getMessage(); + if (LOG.isDebugEnabled()) { + LOG.debug(error, e); + } else { + LOG.error(error + " "+ e.getMessage()); } - }); - } - try { - countDownLatch.await(); - } catch (Exception e) { - throw new RuntimeException(e); + throw new RuntimeException(error); + } + } else { + boundAuthorities.add(currentAddress); + LOG.info("Bound to resource: " + resource); } } } diff --git a/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioDatagramAcceptorTest.java b/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioDatagramAcceptorTest.java index 318aadca78..c903a3ee4a 100644 --- a/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioDatagramAcceptorTest.java +++ b/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioDatagramAcceptorTest.java @@ -31,7 +31,6 @@ import org.kaazing.gateway.resource.address.ResourceAddress; import org.kaazing.gateway.resource.address.ResourceAddressFactory; import org.kaazing.gateway.transport.test.Expectations; -import org.kaazing.gateway.util.scheduler.SchedulerProvider; import org.kaazing.test.util.MethodExecutionTrace; import java.net.DatagramPacket; @@ -67,7 +66,6 @@ public void echo() throws Exception { NioDatagramAcceptor acceptor = new NioDatagramAcceptor(configuration); acceptor.setResourceAddressFactory(newResourceAddressFactory()); acceptor.setTcpAcceptor(tcpAcceptor); - acceptor.setSchedulerProvider(new SchedulerProvider()); acceptor.bind(bindAddress, handler, null); String str = "Hello World"; diff --git a/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioSocketAcceptorTest.java b/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioSocketAcceptorTest.java index 6a557354ad..d638c0eb90 100644 --- a/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioSocketAcceptorTest.java +++ b/transport/nio/src/test/java/org/kaazing/gateway/transport/nio/internal/NioSocketAcceptorTest.java @@ -219,7 +219,6 @@ public void bindAndAcceptShouldInvokeExtensions() throws Exception { configuration.setProperty("maximum.outbound.rate", "10000"); acceptor = new NioSocketAcceptor(configuration, extensionFactory); acceptor.setResourceAddressFactory(newResourceAddressFactory()); - acceptor.setSchedulerProvider(schedulerProvider); final IoSession[] sessions = new IoSession[1]; acceptor.bind(bindAddress, handler, new BridgeSessionInitializer() { @@ -302,7 +301,6 @@ public void bindAndAcceptShouldWorkWhenThereAreNoExtensions() throws Exception { configuration.setProperty("maximum.outbound.rate", "10000"); acceptor = new NioSocketAcceptor(configuration, extensionFactory); acceptor.setResourceAddressFactory(newResourceAddressFactory()); - acceptor.setSchedulerProvider(schedulerProvider); final IoSession[] sessions = new IoSession[1]; acceptor.bind(bindAddress, handler, new BridgeSessionInitializer() { @@ -445,7 +443,6 @@ private void createBindConnectDispose(final boolean writeData) throws Exception ResourceAddressFactory addressFactory = ResourceAddressFactory.newResourceAddressFactory(); acceptor.setResourceAddressFactory(addressFactory); - acceptor.setSchedulerProvider(schedulerProvider); String bindURI = format("tcp://localhost:%d", bindPort); Map opts = new HashMap<>(); opts.put(NEXT_PROTOCOL, "test-protocol"); @@ -540,7 +537,6 @@ public void allWorkersShouldBeUsed_and_reported_by_getWorkerCount_getWorkers() t configuration.setProperty(PROCESSOR_COUNT, Integer.toString(NB_WORKERS)); acceptor = new NioSocketAcceptor(configuration); acceptor.setResourceAddressFactory(newResourceAddressFactory()); - acceptor.setSchedulerProvider(schedulerProvider); final CountDownLatch clientsConnected = new CountDownLatch(NB_WORKERS); ResourceAddressFactory resourceAddressFactory = ResourceAddressFactory.newResourceAddressFactory(); @@ -643,7 +639,7 @@ public void unbindDuringConnect() throws Exception { allowing(mockAcceptor).setHandler(with(aNonNull(IoHandler.class))); will(saveParameter(tcpHandlerHolder, 0)); allowing(mockAcceptor).setSessionDataStructureFactory(with(aNonNull(DefaultIoSessionDataStructureFactory.class))); - allowing(mockAcceptor).bind(with(aNonNull(SocketAddress.class))); + allowing(mockAcceptor).bindAsync(with(aNonNull(SocketAddress.class))); allowing(mockAcceptor).unbind(with(aNonNull(SocketAddress.class))); } public Action saveParameter(final Object[] parameterStorage, final int parameterIndex) { From b502192b41f27ce565122de0fed3f88e9712d5ea Mon Sep 17 00:00:00 2001 From: Kaazing build Date: Thu, 9 Feb 2017 00:54:57 +0000 Subject: [PATCH 50/53] Update version to 5.4.1-RC002 --- bom/pom.xml | 2 +- bridge/gateway.bridge/pom.xml | 2 +- bridge/gateway.client.javascript.bridge/pom.xml | 2 +- bridge/pom.xml | 2 +- distribution/pom.xml | 2 +- management/pom.xml | 2 +- mina.core/core/pom.xml | 2 +- mina.core/integration-beans/pom.xml | 2 +- mina.core/integration-jmx/pom.xml | 2 +- mina.core/integration-ognl/pom.xml | 2 +- mina.core/legal/pom.xml | 2 +- mina.core/parent/pom.xml | 2 +- mina.core/pom.xml | 2 +- mina.core/transport-serial/pom.xml | 2 +- mina.netty/pom.xml | 2 +- pom.xml | 2 +- resource.address/http/pom.xml | 2 +- resource.address/httpx/pom.xml | 2 +- resource.address/httpxdraft/pom.xml | 2 +- resource.address/httpxe/pom.xml | 2 +- resource.address/pipe/pom.xml | 2 +- resource.address/rtmp/pom.xml | 2 +- resource.address/spi/pom.xml | 2 +- resource.address/sse/pom.xml | 2 +- resource.address/ssl/pom.xml | 2 +- resource.address/tcp/pom.xml | 2 +- resource.address/udp/pom.xml | 2 +- resource.address/ws/pom.xml | 2 +- resource.address/wsdraft/pom.xml | 2 +- resource.address/wse/pom.xml | 2 +- resource.address/wsn/pom.xml | 2 +- resource.address/wsx/pom.xml | 2 +- resource.address/wsxdraft/pom.xml | 2 +- security/pom.xml | 2 +- server.api/pom.xml | 2 +- server.spi/pom.xml | 2 +- server/pom.xml | 2 +- service/amqp/pom.xml | 2 +- service/broadcast/pom.xml | 2 +- service/echo/pom.xml | 2 +- service/http.balancer/pom.xml | 2 +- service/http.directory/pom.xml | 2 +- service/http.proxy/pom.xml | 2 +- service/proxy/pom.xml | 2 +- service/spi/pom.xml | 2 +- service/turn.rest/pom.xml | 2 +- service/update.check.management/pom.xml | 2 +- service/update.check/pom.xml | 2 +- test.util/pom.xml | 2 +- transport/bio/pom.xml | 2 +- transport/http/pom.xml | 2 +- transport/nio/pom.xml | 2 +- transport/pipe/pom.xml | 2 +- transport/spi/pom.xml | 2 +- transport/sse/pom.xml | 2 +- transport/ssl/pom.xml | 2 +- transport/ws/pom.xml | 2 +- transport/wseb/pom.xml | 2 +- transport/wsn/pom.xml | 2 +- util/pom.xml | 2 +- 60 files changed, 60 insertions(+), 60 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 4f178c937c..ffb7fb1d5a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 gateway.bom diff --git a/bridge/gateway.bridge/pom.xml b/bridge/gateway.bridge/pom.xml index 21501fe99a..34d8df1311 100644 --- a/bridge/gateway.bridge/pom.xml +++ b/bridge/gateway.bridge/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway.bridge.parent - 5.4.1-RC001 + 5.4.1-RC002 gateway.bridge diff --git a/bridge/gateway.client.javascript.bridge/pom.xml b/bridge/gateway.client.javascript.bridge/pom.xml index 18c82f5683..b2bc5c6d6a 100644 --- a/bridge/gateway.client.javascript.bridge/pom.xml +++ b/bridge/gateway.client.javascript.bridge/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway.bridge.parent - 5.4.1-RC001 + 5.4.1-RC002 gateway.client.javascript.bridge diff --git a/bridge/pom.xml b/bridge/pom.xml index 316bb9a735..25f469a664 100644 --- a/bridge/pom.xml +++ b/bridge/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 gateway.bridge.parent diff --git a/distribution/pom.xml b/distribution/pom.xml index 59d8eae59d..e520f6cf95 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 gateway.distribution diff --git a/management/pom.xml b/management/pom.xml index fcdbbba866..dd74cfc1cd 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 gateway.management diff --git a/mina.core/core/pom.xml b/mina.core/core/pom.xml index 35736ce6d4..e4a7e54b57 100644 --- a/mina.core/core/pom.xml +++ b/mina.core/core/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - 5.4.1-RC001 + 5.4.1-RC002 ../parent diff --git a/mina.core/integration-beans/pom.xml b/mina.core/integration-beans/pom.xml index 1e4dd38a1b..0c595700d7 100644 --- a/mina.core/integration-beans/pom.xml +++ b/mina.core/integration-beans/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - 5.4.1-RC001 + 5.4.1-RC002 ../parent diff --git a/mina.core/integration-jmx/pom.xml b/mina.core/integration-jmx/pom.xml index 02840d491c..5359c6e004 100644 --- a/mina.core/integration-jmx/pom.xml +++ b/mina.core/integration-jmx/pom.xml @@ -6,7 +6,7 @@ org.kaazing mina-parent - 5.4.1-RC001 + 5.4.1-RC002 ../parent mina-integration-jmx diff --git a/mina.core/integration-ognl/pom.xml b/mina.core/integration-ognl/pom.xml index e8d58c9f54..25a4a5f4aa 100644 --- a/mina.core/integration-ognl/pom.xml +++ b/mina.core/integration-ognl/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - 5.4.1-RC001 + 5.4.1-RC002 ../parent diff --git a/mina.core/legal/pom.xml b/mina.core/legal/pom.xml index 371fa89045..76f155dbbf 100644 --- a/mina.core/legal/pom.xml +++ b/mina.core/legal/pom.xml @@ -4,7 +4,7 @@ org.kaazing mina-build - 5.4.1-RC001 + 5.4.1-RC002 mina-legal diff --git a/mina.core/parent/pom.xml b/mina.core/parent/pom.xml index 2dd4aaa7d3..9cc6f1c2ba 100644 --- a/mina.core/parent/pom.xml +++ b/mina.core/parent/pom.xml @@ -4,7 +4,7 @@ org.kaazing mina-build - 5.4.1-RC001 + 5.4.1-RC002 mina-parent diff --git a/mina.core/pom.xml b/mina.core/pom.xml index 4f21b571fe..883a9c411d 100644 --- a/mina.core/pom.xml +++ b/mina.core/pom.xml @@ -7,7 +7,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 mina-build diff --git a/mina.core/transport-serial/pom.xml b/mina.core/transport-serial/pom.xml index 2a574ef408..0c9ceffece 100644 --- a/mina.core/transport-serial/pom.xml +++ b/mina.core/transport-serial/pom.xml @@ -6,7 +6,7 @@ org.kaazing mina-parent - 5.4.1-RC001 + 5.4.1-RC002 diff --git a/mina.netty/pom.xml b/mina.netty/pom.xml index 22ccf78a49..79465e1342 100644 --- a/mina.netty/pom.xml +++ b/mina.netty/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 mina.netty jar diff --git a/pom.xml b/pom.xml index 977053ef11..c26b8d2935 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ gateway Kaazing Gateway - 5.4.1-RC001 + 5.4.1-RC002 pom https://github.com/kaazing/gateway diff --git a/resource.address/http/pom.xml b/resource.address/http/pom.xml index 3428c404ac..0dc6b7ca6e 100644 --- a/resource.address/http/pom.xml +++ b/resource.address/http/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/httpx/pom.xml b/resource.address/httpx/pom.xml index b5578e5983..360412a0ef 100644 --- a/resource.address/httpx/pom.xml +++ b/resource.address/httpx/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/httpxdraft/pom.xml b/resource.address/httpxdraft/pom.xml index 6194a7073c..d8e32fb803 100644 --- a/resource.address/httpxdraft/pom.xml +++ b/resource.address/httpxdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/httpxe/pom.xml b/resource.address/httpxe/pom.xml index 812e578c2e..088411ce9e 100644 --- a/resource.address/httpxe/pom.xml +++ b/resource.address/httpxe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/pipe/pom.xml b/resource.address/pipe/pom.xml index 92755272ac..46a1a1785f 100644 --- a/resource.address/pipe/pom.xml +++ b/resource.address/pipe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/rtmp/pom.xml b/resource.address/rtmp/pom.xml index dfc24f7e33..fdc6c892db 100644 --- a/resource.address/rtmp/pom.xml +++ b/resource.address/rtmp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/spi/pom.xml b/resource.address/spi/pom.xml index f8780df526..3bac8b073f 100644 --- a/resource.address/spi/pom.xml +++ b/resource.address/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/sse/pom.xml b/resource.address/sse/pom.xml index 91c46ffef1..1d2f42b140 100644 --- a/resource.address/sse/pom.xml +++ b/resource.address/sse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/ssl/pom.xml b/resource.address/ssl/pom.xml index 0ad5eb3192..7523a67112 100644 --- a/resource.address/ssl/pom.xml +++ b/resource.address/ssl/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/tcp/pom.xml b/resource.address/tcp/pom.xml index 89aa1b5a83..a9d87f442d 100644 --- a/resource.address/tcp/pom.xml +++ b/resource.address/tcp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/udp/pom.xml b/resource.address/udp/pom.xml index b5903cfaf6..18b3f4cd11 100644 --- a/resource.address/udp/pom.xml +++ b/resource.address/udp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/ws/pom.xml b/resource.address/ws/pom.xml index f98532f47c..6a00763795 100644 --- a/resource.address/ws/pom.xml +++ b/resource.address/ws/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/wsdraft/pom.xml b/resource.address/wsdraft/pom.xml index 9828b6d996..8061f29926 100644 --- a/resource.address/wsdraft/pom.xml +++ b/resource.address/wsdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/wse/pom.xml b/resource.address/wse/pom.xml index 8475b69d4a..a3d85da8f0 100644 --- a/resource.address/wse/pom.xml +++ b/resource.address/wse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.resource.address.wse diff --git a/resource.address/wsn/pom.xml b/resource.address/wsn/pom.xml index 26a7d6a5b0..fbd3275845 100644 --- a/resource.address/wsn/pom.xml +++ b/resource.address/wsn/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/wsx/pom.xml b/resource.address/wsx/pom.xml index c5fa3ed00f..28de464ddd 100644 --- a/resource.address/wsx/pom.xml +++ b/resource.address/wsx/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml diff --git a/resource.address/wsxdraft/pom.xml b/resource.address/wsxdraft/pom.xml index 556c655e21..c740fb0c75 100644 --- a/resource.address/wsxdraft/pom.xml +++ b/resource.address/wsxdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.resource.address.wsxdraft diff --git a/security/pom.xml b/security/pom.xml index 4064b19798..4a433dc1f2 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 gateway.security diff --git a/server.api/pom.xml b/server.api/pom.xml index 3b771a51ca..8cb4027f29 100644 --- a/server.api/pom.xml +++ b/server.api/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 gateway.server.api diff --git a/server.spi/pom.xml b/server.spi/pom.xml index 0cd99b173c..6c34da73a6 100644 --- a/server.spi/pom.xml +++ b/server.spi/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 gateway.server.spi diff --git a/server/pom.xml b/server/pom.xml index 6f89e7e5b0..8b73ea4978 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 gateway.server Kaazing WebSocket Gateway - Server diff --git a/service/amqp/pom.xml b/service/amqp/pom.xml index 3597eceae9..7d23fcc164 100644 --- a/service/amqp/pom.xml +++ b/service/amqp/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml 4.0.0 diff --git a/service/broadcast/pom.xml b/service/broadcast/pom.xml index 82eb456915..c044cb61ed 100644 --- a/service/broadcast/pom.xml +++ b/service/broadcast/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.service.broadcast diff --git a/service/echo/pom.xml b/service/echo/pom.xml index 33d78fd633..a21b801ab0 100644 --- a/service/echo/pom.xml +++ b/service/echo/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.service.echo diff --git a/service/http.balancer/pom.xml b/service/http.balancer/pom.xml index bbdba11e33..a862a3c86b 100644 --- a/service/http.balancer/pom.xml +++ b/service/http.balancer/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.service.http.balancer diff --git a/service/http.directory/pom.xml b/service/http.directory/pom.xml index e618e7c1e3..ea9c5d9846 100644 --- a/service/http.directory/pom.xml +++ b/service/http.directory/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.service.http.directory diff --git a/service/http.proxy/pom.xml b/service/http.proxy/pom.xml index 8d3a30f059..43d9855262 100644 --- a/service/http.proxy/pom.xml +++ b/service/http.proxy/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.service.http.proxy diff --git a/service/proxy/pom.xml b/service/proxy/pom.xml index caa1ad19fc..5f3b9a5e25 100644 --- a/service/proxy/pom.xml +++ b/service/proxy/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.service.proxy diff --git a/service/spi/pom.xml b/service/spi/pom.xml index ab8d028fc1..6290c4872e 100644 --- a/service/spi/pom.xml +++ b/service/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.service diff --git a/service/turn.rest/pom.xml b/service/turn.rest/pom.xml index 1e1f1b2516..4a4e5edf0f 100644 --- a/service/turn.rest/pom.xml +++ b/service/turn.rest/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.service.turn.rest diff --git a/service/update.check.management/pom.xml b/service/update.check.management/pom.xml index 710a8b6017..990d4679d0 100644 --- a/service/update.check.management/pom.xml +++ b/service/update.check.management/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.service.update.check.management diff --git a/service/update.check/pom.xml b/service/update.check/pom.xml index 8aab68d646..472eb35b52 100644 --- a/service/update.check/pom.xml +++ b/service/update.check/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.service.update.check diff --git a/test.util/pom.xml b/test.util/pom.xml index 86393f1e78..f3655da066 100644 --- a/test.util/pom.xml +++ b/test.util/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 test.util diff --git a/transport/bio/pom.xml b/transport/bio/pom.xml index 70fdbbd46e..3162541d5a 100644 --- a/transport/bio/pom.xml +++ b/transport/bio/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.transport.bio diff --git a/transport/http/pom.xml b/transport/http/pom.xml index 98e3015864..858c82c23b 100644 --- a/transport/http/pom.xml +++ b/transport/http/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.transport.http diff --git a/transport/nio/pom.xml b/transport/nio/pom.xml index 93b1e83c52..234a3dadae 100644 --- a/transport/nio/pom.xml +++ b/transport/nio/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.transport.nio diff --git a/transport/pipe/pom.xml b/transport/pipe/pom.xml index bb8cf52694..dd0ccfc68c 100644 --- a/transport/pipe/pom.xml +++ b/transport/pipe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.transport.pipe diff --git a/transport/spi/pom.xml b/transport/spi/pom.xml index 6189e286bc..7447aee27f 100644 --- a/transport/spi/pom.xml +++ b/transport/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.transport diff --git a/transport/sse/pom.xml b/transport/sse/pom.xml index f1666b9dc2..a850f90d6c 100644 --- a/transport/sse/pom.xml +++ b/transport/sse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.transport.sse diff --git a/transport/ssl/pom.xml b/transport/ssl/pom.xml index 69b6a283db..c0ebb9a0b0 100644 --- a/transport/ssl/pom.xml +++ b/transport/ssl/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.transport.ssl diff --git a/transport/ws/pom.xml b/transport/ws/pom.xml index b39f5e2390..f1fe387e9f 100644 --- a/transport/ws/pom.xml +++ b/transport/ws/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.transport.ws diff --git a/transport/wseb/pom.xml b/transport/wseb/pom.xml index 7953c9f256..3311f3a417 100644 --- a/transport/wseb/pom.xml +++ b/transport/wseb/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.transport.wseb diff --git a/transport/wsn/pom.xml b/transport/wsn/pom.xml index 8c5a76f07a..f47dd2bbd9 100644 --- a/transport/wsn/pom.xml +++ b/transport/wsn/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 ../../pom.xml gateway.transport.wsn diff --git a/util/pom.xml b/util/pom.xml index 8f2efe24a8..9de90a089f 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC001 + 5.4.1-RC002 gateway.util Gateway Utils From 6562d17c1595af4261814ab9464c4ab113f45d5d Mon Sep 17 00:00:00 2001 From: Kaazing build Date: Thu, 9 Feb 2017 01:20:52 +0000 Subject: [PATCH 51/53] Generate CHANGELOG.md for version 5.4.1-RC002 --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c278f03bf3..e868068c2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ # Change Log -## [5.4.1-RC001](https://github.com/kaazing/gateway/tree/5.4.1-RC001) (2017-02-06) -[Full Changelog](https://github.com/kaazing/gateway/compare/5.4.0...5.4.1-RC001) +## [5.4.1-RC002](https://github.com/kaazing/gateway/tree/5.4.1-RC002) (2017-02-09) +[Full Changelog](https://github.com/kaazing/gateway/compare/5.4.0...5.4.1-RC002) **Merged pull requests:** +- Revert "\(\#850\) Sync'd AbstractIoAcceptor from mina 2.0.16, fixed bind… [\#867](https://github.com/kaazing/gateway/pull/867) ([sbadugu](https://github.com/sbadugu)) - Clean up system property. [\#865](https://github.com/kaazing/gateway/pull/865) ([vmaraloiu](https://github.com/vmaraloiu)) - Reverted shade plugin to generate the reduced pom. [\#864](https://github.com/kaazing/gateway/pull/864) ([Anisotrop](https://github.com/Anisotrop)) - Remove System Properties which should be undocumented from Javadoc [\#860](https://github.com/kaazing/gateway/pull/860) ([vmaraloiu](https://github.com/vmaraloiu)) From a8df25fc8251d6a2688762aff96e52482246f480 Mon Sep 17 00:00:00 2001 From: Kaazing build Date: Fri, 10 Feb 2017 19:39:02 +0000 Subject: [PATCH 52/53] Update version to 5.4.1 --- bom/pom.xml | 2 +- bridge/gateway.bridge/pom.xml | 2 +- bridge/gateway.client.javascript.bridge/pom.xml | 2 +- bridge/pom.xml | 2 +- distribution/pom.xml | 2 +- management/pom.xml | 2 +- mina.core/core/pom.xml | 2 +- mina.core/integration-beans/pom.xml | 2 +- mina.core/integration-jmx/pom.xml | 2 +- mina.core/integration-ognl/pom.xml | 2 +- mina.core/legal/pom.xml | 2 +- mina.core/parent/pom.xml | 2 +- mina.core/pom.xml | 2 +- mina.core/transport-serial/pom.xml | 2 +- mina.netty/pom.xml | 2 +- pom.xml | 2 +- resource.address/http/pom.xml | 2 +- resource.address/httpx/pom.xml | 2 +- resource.address/httpxdraft/pom.xml | 2 +- resource.address/httpxe/pom.xml | 2 +- resource.address/pipe/pom.xml | 2 +- resource.address/rtmp/pom.xml | 2 +- resource.address/spi/pom.xml | 2 +- resource.address/sse/pom.xml | 2 +- resource.address/ssl/pom.xml | 2 +- resource.address/tcp/pom.xml | 2 +- resource.address/udp/pom.xml | 2 +- resource.address/ws/pom.xml | 2 +- resource.address/wsdraft/pom.xml | 2 +- resource.address/wse/pom.xml | 2 +- resource.address/wsn/pom.xml | 2 +- resource.address/wsx/pom.xml | 2 +- resource.address/wsxdraft/pom.xml | 2 +- security/pom.xml | 2 +- server.api/pom.xml | 2 +- server.spi/pom.xml | 2 +- server/pom.xml | 2 +- service/amqp/pom.xml | 2 +- service/broadcast/pom.xml | 2 +- service/echo/pom.xml | 2 +- service/http.balancer/pom.xml | 2 +- service/http.directory/pom.xml | 2 +- service/http.proxy/pom.xml | 2 +- service/proxy/pom.xml | 2 +- service/spi/pom.xml | 2 +- service/turn.rest/pom.xml | 2 +- service/update.check.management/pom.xml | 2 +- service/update.check/pom.xml | 2 +- test.util/pom.xml | 2 +- transport/bio/pom.xml | 2 +- transport/http/pom.xml | 2 +- transport/nio/pom.xml | 2 +- transport/pipe/pom.xml | 2 +- transport/spi/pom.xml | 2 +- transport/sse/pom.xml | 2 +- transport/ssl/pom.xml | 2 +- transport/ws/pom.xml | 2 +- transport/wseb/pom.xml | 2 +- transport/wsn/pom.xml | 2 +- util/pom.xml | 2 +- 60 files changed, 60 insertions(+), 60 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index ffb7fb1d5a..7b3b331af8 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 gateway.bom diff --git a/bridge/gateway.bridge/pom.xml b/bridge/gateway.bridge/pom.xml index 34d8df1311..848868044c 100644 --- a/bridge/gateway.bridge/pom.xml +++ b/bridge/gateway.bridge/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway.bridge.parent - 5.4.1-RC002 + 5.4.1 gateway.bridge diff --git a/bridge/gateway.client.javascript.bridge/pom.xml b/bridge/gateway.client.javascript.bridge/pom.xml index b2bc5c6d6a..9b47ae1e35 100644 --- a/bridge/gateway.client.javascript.bridge/pom.xml +++ b/bridge/gateway.client.javascript.bridge/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway.bridge.parent - 5.4.1-RC002 + 5.4.1 gateway.client.javascript.bridge diff --git a/bridge/pom.xml b/bridge/pom.xml index 25f469a664..40a16b225b 100644 --- a/bridge/pom.xml +++ b/bridge/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 gateway.bridge.parent diff --git a/distribution/pom.xml b/distribution/pom.xml index e520f6cf95..c944cb83ca 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 gateway.distribution diff --git a/management/pom.xml b/management/pom.xml index dd74cfc1cd..2a46bb11e8 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 gateway.management diff --git a/mina.core/core/pom.xml b/mina.core/core/pom.xml index e4a7e54b57..78e5ccae1e 100644 --- a/mina.core/core/pom.xml +++ b/mina.core/core/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - 5.4.1-RC002 + 5.4.1 ../parent diff --git a/mina.core/integration-beans/pom.xml b/mina.core/integration-beans/pom.xml index 0c595700d7..9e733449ec 100644 --- a/mina.core/integration-beans/pom.xml +++ b/mina.core/integration-beans/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - 5.4.1-RC002 + 5.4.1 ../parent diff --git a/mina.core/integration-jmx/pom.xml b/mina.core/integration-jmx/pom.xml index 5359c6e004..0ba7965d75 100644 --- a/mina.core/integration-jmx/pom.xml +++ b/mina.core/integration-jmx/pom.xml @@ -6,7 +6,7 @@ org.kaazing mina-parent - 5.4.1-RC002 + 5.4.1 ../parent mina-integration-jmx diff --git a/mina.core/integration-ognl/pom.xml b/mina.core/integration-ognl/pom.xml index 25a4a5f4aa..1c9c22b349 100644 --- a/mina.core/integration-ognl/pom.xml +++ b/mina.core/integration-ognl/pom.xml @@ -5,7 +5,7 @@ org.kaazing mina-parent - 5.4.1-RC002 + 5.4.1 ../parent diff --git a/mina.core/legal/pom.xml b/mina.core/legal/pom.xml index 76f155dbbf..931d94bbdc 100644 --- a/mina.core/legal/pom.xml +++ b/mina.core/legal/pom.xml @@ -4,7 +4,7 @@ org.kaazing mina-build - 5.4.1-RC002 + 5.4.1 mina-legal diff --git a/mina.core/parent/pom.xml b/mina.core/parent/pom.xml index 9cc6f1c2ba..6ec1b0482f 100644 --- a/mina.core/parent/pom.xml +++ b/mina.core/parent/pom.xml @@ -4,7 +4,7 @@ org.kaazing mina-build - 5.4.1-RC002 + 5.4.1 mina-parent diff --git a/mina.core/pom.xml b/mina.core/pom.xml index 883a9c411d..8b05398e55 100644 --- a/mina.core/pom.xml +++ b/mina.core/pom.xml @@ -7,7 +7,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 mina-build diff --git a/mina.core/transport-serial/pom.xml b/mina.core/transport-serial/pom.xml index 0c9ceffece..232335c4c1 100644 --- a/mina.core/transport-serial/pom.xml +++ b/mina.core/transport-serial/pom.xml @@ -6,7 +6,7 @@ org.kaazing mina-parent - 5.4.1-RC002 + 5.4.1 diff --git a/mina.netty/pom.xml b/mina.netty/pom.xml index 79465e1342..a96e7777bc 100644 --- a/mina.netty/pom.xml +++ b/mina.netty/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 mina.netty jar diff --git a/pom.xml b/pom.xml index c26b8d2935..5840e5c2a6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ gateway Kaazing Gateway - 5.4.1-RC002 + 5.4.1 pom https://github.com/kaazing/gateway diff --git a/resource.address/http/pom.xml b/resource.address/http/pom.xml index 0dc6b7ca6e..42df4d2960 100644 --- a/resource.address/http/pom.xml +++ b/resource.address/http/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/httpx/pom.xml b/resource.address/httpx/pom.xml index 360412a0ef..a5341dc5ca 100644 --- a/resource.address/httpx/pom.xml +++ b/resource.address/httpx/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/httpxdraft/pom.xml b/resource.address/httpxdraft/pom.xml index d8e32fb803..d5e580e988 100644 --- a/resource.address/httpxdraft/pom.xml +++ b/resource.address/httpxdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/httpxe/pom.xml b/resource.address/httpxe/pom.xml index 088411ce9e..5275c9d915 100644 --- a/resource.address/httpxe/pom.xml +++ b/resource.address/httpxe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/pipe/pom.xml b/resource.address/pipe/pom.xml index 46a1a1785f..eb0a59ba01 100644 --- a/resource.address/pipe/pom.xml +++ b/resource.address/pipe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/rtmp/pom.xml b/resource.address/rtmp/pom.xml index fdc6c892db..3e14b564e4 100644 --- a/resource.address/rtmp/pom.xml +++ b/resource.address/rtmp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/spi/pom.xml b/resource.address/spi/pom.xml index 3bac8b073f..5de6db336b 100644 --- a/resource.address/spi/pom.xml +++ b/resource.address/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/sse/pom.xml b/resource.address/sse/pom.xml index 1d2f42b140..56971e3c72 100644 --- a/resource.address/sse/pom.xml +++ b/resource.address/sse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/ssl/pom.xml b/resource.address/ssl/pom.xml index 7523a67112..9e897512ce 100644 --- a/resource.address/ssl/pom.xml +++ b/resource.address/ssl/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/tcp/pom.xml b/resource.address/tcp/pom.xml index a9d87f442d..d61bdce80a 100644 --- a/resource.address/tcp/pom.xml +++ b/resource.address/tcp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/udp/pom.xml b/resource.address/udp/pom.xml index 18b3f4cd11..72804857bb 100644 --- a/resource.address/udp/pom.xml +++ b/resource.address/udp/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/ws/pom.xml b/resource.address/ws/pom.xml index 6a00763795..5fc71f7686 100644 --- a/resource.address/ws/pom.xml +++ b/resource.address/ws/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/wsdraft/pom.xml b/resource.address/wsdraft/pom.xml index 8061f29926..597cd78914 100644 --- a/resource.address/wsdraft/pom.xml +++ b/resource.address/wsdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/wse/pom.xml b/resource.address/wse/pom.xml index a3d85da8f0..b7eb6f8525 100644 --- a/resource.address/wse/pom.xml +++ b/resource.address/wse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.resource.address.wse diff --git a/resource.address/wsn/pom.xml b/resource.address/wsn/pom.xml index fbd3275845..52767a024a 100644 --- a/resource.address/wsn/pom.xml +++ b/resource.address/wsn/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/wsx/pom.xml b/resource.address/wsx/pom.xml index 28de464ddd..4e69e9d0d4 100644 --- a/resource.address/wsx/pom.xml +++ b/resource.address/wsx/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml diff --git a/resource.address/wsxdraft/pom.xml b/resource.address/wsxdraft/pom.xml index c740fb0c75..d100493dab 100644 --- a/resource.address/wsxdraft/pom.xml +++ b/resource.address/wsxdraft/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.resource.address.wsxdraft diff --git a/security/pom.xml b/security/pom.xml index 4a433dc1f2..5ec01e30bd 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 gateway.security diff --git a/server.api/pom.xml b/server.api/pom.xml index 8cb4027f29..9e0e438c14 100644 --- a/server.api/pom.xml +++ b/server.api/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 gateway.server.api diff --git a/server.spi/pom.xml b/server.spi/pom.xml index 6c34da73a6..212decc23d 100644 --- a/server.spi/pom.xml +++ b/server.spi/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 gateway.server.spi diff --git a/server/pom.xml b/server/pom.xml index 8b73ea4978..cfaf4a8bd8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 gateway.server Kaazing WebSocket Gateway - Server diff --git a/service/amqp/pom.xml b/service/amqp/pom.xml index 7d23fcc164..84b4b354b9 100644 --- a/service/amqp/pom.xml +++ b/service/amqp/pom.xml @@ -4,7 +4,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml 4.0.0 diff --git a/service/broadcast/pom.xml b/service/broadcast/pom.xml index c044cb61ed..050d696421 100644 --- a/service/broadcast/pom.xml +++ b/service/broadcast/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.service.broadcast diff --git a/service/echo/pom.xml b/service/echo/pom.xml index a21b801ab0..dd34059b56 100644 --- a/service/echo/pom.xml +++ b/service/echo/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.service.echo diff --git a/service/http.balancer/pom.xml b/service/http.balancer/pom.xml index a862a3c86b..000ea9338c 100644 --- a/service/http.balancer/pom.xml +++ b/service/http.balancer/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.service.http.balancer diff --git a/service/http.directory/pom.xml b/service/http.directory/pom.xml index ea9c5d9846..96a2455ca0 100644 --- a/service/http.directory/pom.xml +++ b/service/http.directory/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.service.http.directory diff --git a/service/http.proxy/pom.xml b/service/http.proxy/pom.xml index 43d9855262..74952fa864 100644 --- a/service/http.proxy/pom.xml +++ b/service/http.proxy/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.service.http.proxy diff --git a/service/proxy/pom.xml b/service/proxy/pom.xml index 5f3b9a5e25..6351761f8a 100644 --- a/service/proxy/pom.xml +++ b/service/proxy/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.service.proxy diff --git a/service/spi/pom.xml b/service/spi/pom.xml index 6290c4872e..e953092b27 100644 --- a/service/spi/pom.xml +++ b/service/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.service diff --git a/service/turn.rest/pom.xml b/service/turn.rest/pom.xml index 4a4e5edf0f..c08421ab74 100644 --- a/service/turn.rest/pom.xml +++ b/service/turn.rest/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.service.turn.rest diff --git a/service/update.check.management/pom.xml b/service/update.check.management/pom.xml index 990d4679d0..5a661be414 100644 --- a/service/update.check.management/pom.xml +++ b/service/update.check.management/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.service.update.check.management diff --git a/service/update.check/pom.xml b/service/update.check/pom.xml index 472eb35b52..b2a19371d9 100644 --- a/service/update.check/pom.xml +++ b/service/update.check/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.service.update.check diff --git a/test.util/pom.xml b/test.util/pom.xml index f3655da066..1f9c6b861f 100644 --- a/test.util/pom.xml +++ b/test.util/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 test.util diff --git a/transport/bio/pom.xml b/transport/bio/pom.xml index 3162541d5a..df33fb3ce7 100644 --- a/transport/bio/pom.xml +++ b/transport/bio/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.transport.bio diff --git a/transport/http/pom.xml b/transport/http/pom.xml index 858c82c23b..00d86fcc58 100644 --- a/transport/http/pom.xml +++ b/transport/http/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.transport.http diff --git a/transport/nio/pom.xml b/transport/nio/pom.xml index 234a3dadae..88b56cd67a 100644 --- a/transport/nio/pom.xml +++ b/transport/nio/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.transport.nio diff --git a/transport/pipe/pom.xml b/transport/pipe/pom.xml index dd0ccfc68c..7f32acabc3 100644 --- a/transport/pipe/pom.xml +++ b/transport/pipe/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.transport.pipe diff --git a/transport/spi/pom.xml b/transport/spi/pom.xml index 7447aee27f..c94c89211e 100644 --- a/transport/spi/pom.xml +++ b/transport/spi/pom.xml @@ -5,7 +5,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.transport diff --git a/transport/sse/pom.xml b/transport/sse/pom.xml index a850f90d6c..a317c5c0c7 100644 --- a/transport/sse/pom.xml +++ b/transport/sse/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.transport.sse diff --git a/transport/ssl/pom.xml b/transport/ssl/pom.xml index c0ebb9a0b0..73407cf0f2 100644 --- a/transport/ssl/pom.xml +++ b/transport/ssl/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.transport.ssl diff --git a/transport/ws/pom.xml b/transport/ws/pom.xml index f1fe387e9f..7535dd71c7 100644 --- a/transport/ws/pom.xml +++ b/transport/ws/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.transport.ws diff --git a/transport/wseb/pom.xml b/transport/wseb/pom.xml index 3311f3a417..0378057b44 100644 --- a/transport/wseb/pom.xml +++ b/transport/wseb/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.transport.wseb diff --git a/transport/wsn/pom.xml b/transport/wsn/pom.xml index f47dd2bbd9..73dac6ea0b 100644 --- a/transport/wsn/pom.xml +++ b/transport/wsn/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 ../../pom.xml gateway.transport.wsn diff --git a/util/pom.xml b/util/pom.xml index 9de90a089f..1f96ad285b 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -6,7 +6,7 @@ org.kaazing gateway - 5.4.1-RC002 + 5.4.1 gateway.util Gateway Utils From d593204f289e9ff2c066be8e6a126835696a56b5 Mon Sep 17 00:00:00 2001 From: Kaazing build Date: Fri, 10 Feb 2017 20:06:06 +0000 Subject: [PATCH 53/53] Generate CHANGELOG.md for version 5.4.1 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e868068c2c..3633c91439 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change Log -## [5.4.1-RC002](https://github.com/kaazing/gateway/tree/5.4.1-RC002) (2017-02-09) -[Full Changelog](https://github.com/kaazing/gateway/compare/5.4.0...5.4.1-RC002) +## [5.4.1](https://github.com/kaazing/gateway/tree/5.4.1) (2017-02-10) +[Full Changelog](https://github.com/kaazing/gateway/compare/5.4.0...5.4.1) **Merged pull requests:**