Merge branch 'master' of github.com:processone/tsung into github

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

include/ts_amqp.hrl

@@ -1,3 +1,27 @@
+%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%
+%%%  Copyright (C) 2013 Zhihui Jiao
+%%%
+%%%  This program is free software; you can redistribute it and/or modify
+%%%  it under the terms of the GNU General Public License as published by
+%%%  the Free Software Foundation; either version 2 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 Public License for more details.
+%%%
+%%%  You should have received a copy of the GNU General Public License
+%%%  along with this program; if not, write to the Free Software
+%%%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+%%%
+%%%  In addition, as a special exception, you have the permission to
+%%%  link the code of this program with any library released under
+%%%  the EPL license and distribute linked combinations including
+%%%  the two; the MPL (Mozilla Public License), which EPL (Erlang
+%%%  Public License) is based on, is included in this exception.
+
 -vc('$Id$ ').
 -author('jzhihui521@gmail.com').
 

include/ts_websocket.hrl

@@ -1,6 +1,6 @@
-%%%  This code was developped by IDEALX (http://IDEALX.org/) and
-%%%  contributors (their names can be found in the CONTRIBUTORS file).
-%%%  Copyright (C) 2000-2001 IDEALX
+%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%
+%%%  Copyright (C) 2013 Zhihui Jiao
 %%%
 %%%  This program is free software; you can redistribute it and/or modify
 %%%  it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@
 %%%  the two; the MPL (Mozilla Public License), which EPL (Erlang
 %%%  Public License) is based on, is included in this exception.
 
-
 -vc('$Id$ ').
 -author('jzhihui521@gmail.com').
 

src/lib/websocket.erl

@@ -1,6 +1,6 @@
-%%%  This code was developped by IDEALX (http://IDEALX.org/) and
-%%%  contributors (their names can be found in the CONTRIBUTORS file).
-%%%  Copyright (C) 2000-2001 IDEALX
+%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%
+%%%  Copyright (C) 2013 Zhihui Jiao
 %%%
 %%%  This program is free software; you can redistribute it and/or modify
 %%%  it under the terms of the GNU General Public License as published by
@@ -19,7 +19,8 @@
 %%%  In addition, as a special exception, you have the permission to
 %%%  link the code of this program with any library released under
 %%%  the EPL license and distribute linked combinations including
-%%%  the two.
+%%%  the two; the MPL (Mozilla Public License), which EPL (Erlang
+%%%  Public License) is based on, is included in this exception.
 
 -module(websocket).
 

src/tsung/ts_amqp.erl

@@ -1,3 +1,7 @@
+%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%
+%%%  Copyright (C) 2013 Zhihui Jiao
+%%%
 %%%  This program is free software; you can redistribute it and/or modify
 %%%  it under the terms of the GNU General Public License as published by
 %%%  the Free Software Foundation; either version 2 of the License, or
@@ -15,7 +19,9 @@
 %%%  In addition, as a special exception, you have the permission to
 %%%  link the code of this program with any library released under
 %%%  the EPL license and distribute linked combinations including
-%%%  the two.
+%%%  the two; the MPL (Mozilla Public License), which EPL (Erlang
+%%%  Public License) is based on, is included in this exception.
+
 -module(ts_amqp).
 
 -vc('$Id$ ').

src/tsung/ts_websocket.erl

@@ -1,6 +1,6 @@
-%%%  This code was developped by IDEALX (http://IDEALX.org/) and
-%%%  contributors (their names can be found in the CONTRIBUTORS file).
-%%%  Copyright (C) 2000-2001 IDEALX
+%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%
+%%%  Copyright (C) 2013 Zhihui Jiao
 %%%
 %%%  This program is free software; you can redistribute it and/or modify
 %%%  it under the terms of the GNU General Public License as published by

src/tsung_controller/ts_config_amqp.erl

@@ -1,3 +1,7 @@
+%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%
+%%%  Copyright (C) 2013 Zhihui Jiao
+%%%
 %%%  This program is free software; you can redistribute it and/or modify
 %%%  it under the terms of the GNU General Public License as published by
 %%%  the Free Software Foundation; either version 2 of the License, or
@@ -15,7 +19,9 @@
 %%%  In addition, as a special exception, you have the permission to
 %%%  link the code of this program with any library released under
 %%%  the EPL license and distribute linked combinations including
-%%%  the two.
+%%%  the two; the MPL (Mozilla Public License), which EPL (Erlang
+%%%  Public License) is based on, is included in this exception.
+
 -module(ts_config_amqp).
 
 -vc('$Id$ ').

src/tsung_controller/ts_config_websocket.erl

@@ -1,6 +1,6 @@
-%%%  This code was developped by IDEALX (http://IDEALX.org/) and
-%%%  contributors (their names can be found in the CONTRIBUTORS file).
-%%%  Copyright (C) 2000-2001 IDEALX
+%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%
+%%%  Copyright (C) 2013 Zhihui Jiao
 %%%
 %%%  This program is free software; you can redistribute it and/or modify
 %%%  it under the terms of the GNU General Public License as published by