You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jo...@apache.org on 2016/08/15 22:27:48 UTC
activemq git commit: Renamed README file. Updated link for encryption
and location of LICENSE. Update NOTICE year.
Repository: activemq
Updated Branches:
refs/heads/master 6d44ae6e9 -> d39fe372e
Renamed README file. Updated link for encryption and location of LICENSE. Update NOTICE year.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/d39fe372
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/d39fe372
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/d39fe372
Branch: refs/heads/master
Commit: d39fe372e5085705bd1219f96ebfd78b83cf4565
Parents: 6d44ae6
Author: John D. Ament <jo...@apache.org>
Authored: Thu Aug 4 07:10:21 2016 -0400
Committer: John D. Ament <jo...@apache.org>
Committed: Mon Aug 15 18:27:37 2016 -0400
----------------------------------------------------------------------
NOTICE | 2 +-
README.md | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
README.txt | 63 ---------------------------------------------------------
3 files changed, 64 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/d39fe372/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 76575a4..77492b9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache ActiveMQ Copyright 2005-2015 Apache Software Foundation
+Apache ActiveMQ Copyright 2005-2016 Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/activemq/blob/d39fe372/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100755
index 0000000..c3d9e32
--- /dev/null
+++ b/README.md
@@ -0,0 +1,63 @@
+Welcome to Apache ActiveMQ
+=======================================================================
+Apache ActiveMQ is a high performance Apache 2.0 licensed
+Message Broker and JMS 1.1 implementation.
+
+Getting Started
+===============
+To help you get started, try the following links:
+
+Getting Started
+- http://activemq.apache.org/version-5-getting-started.html
+
+Building
+- http://activemq.apache.org/version-5-getting-started.html#GettingStarted-WindowsSourceInstallation
+- http://activemq.apache.org/version-5-getting-started.html#GettingStarted-UnixSourceInstallation
+
+Examples
+- http://activemq.apache.org/examples.html
+
+We welcome contributions of all kinds, for details of how you can help
+http://activemq.apache.org/contributing.html
+
+Please refer to the website for details of finding the issue tracker,
+email lists, wiki or IRC channel at http://activemq.apache.org/
+
+Please help us make Apache ActiveMQ better - we appreciate any feedback
+you may have.
+
+Enjoy!
+
+Licensing
+=======================================================================
+
+ This software is licensed under the terms you may find in the file
+ named "LICENSE" in this directory.
+
+ This distribution includes cryptographic software. The country in
+ which you currently reside may have restrictions on the import,
+ possession, use, and/or re-export to another country, of
+ encryption software. BEFORE using any encryption software, please
+ check your country's laws, regulations and policies concerning the
+ import, possession, or use, and re-export of encryption software, to
+ see if this is permitted. See <http://www.wassenaar.org/> for more
+ information.
+
+ The U.S. Government Department of Commerce, Bureau of Industry and
+ Security (BIS), has classified this software as Export Commodity
+ Control Number (ECCN) 5D002.C.1, which includes information security
+ software using or performing cryptographic functions with asymmetric
+ algorithms. The form and manner of this Apache Software Foundation
+ distribution makes it eligible for export under the License Exception
+ ENC Technology Software Unrestricted (TSU) exception (see the BIS
+ Export Administration Regulations, Section 740.13) for both object
+ code and source code.
+
+ The following provides more details on the included cryptographic
+ software:
+
+ ActiveMQ supports the use of SSL TCP connections when used with
+ with a JVM supporting the Java Cryptography extensions
+ <http://www.oracle.com/technetwork/java/javase/tech/index-jsp-136007.html>.
+ ActiveMQ does not include these libraries itself, but is designed to use them.
+
http://git-wip-us.apache.org/repos/asf/activemq/blob/d39fe372/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
deleted file mode 100755
index 7145c28..0000000
--- a/README.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-Welcome to Apache ActiveMQ
-=======================================================================
-Apache ActiveMQ is a high performance Apache 2.0 licensed
-Message Broker and JMS 1.1 implementation.
-
-Getting Started
-===============
-To help you get started, try the following links:
-
-Getting Started
-http://activemq.apache.org/version-5-getting-started.html
-
-Building
-http://activemq.apache.org/version-5-getting-started.html#GettingStarted-WindowsSourceInstallation
-http://activemq.apache.org/version-5-getting-started.html#GettingStarted-UnixSourceInstallation
-
-Examples
-http://activemq.apache.org/examples.html
-
-We welcome contributions of all kinds, for details of how you can help
-http://activemq.apache.org/contributing.html
-
-Please refer to the website for details of finding the issue tracker,
-email lists, wiki or IRC channel at http://activemq.apache.org/
-
-Please help us make Apache ActiveMQ better - we appreciate any feedback
-you may have.
-
-Enjoy!
-
-Licensing
-=======================================================================
-
- This software is licensed under the terms you may find in the file
- named "LICENSE.txt" in this directory.
-
- This distribution includes cryptographic software. The country in
- which you currently reside may have restrictions on the import,
- possession, use, and/or re-export to another country, of
- encryption software. BEFORE using any encryption software, please
- check your country's laws, regulations and policies concerning the
- import, possession, or use, and re-export of encryption software, to
- see if this is permitted. See <http://www.wassenaar.org/> for more
- information.
-
- The U.S. Government Department of Commerce, Bureau of Industry and
- Security (BIS), has classified this software as Export Commodity
- Control Number (ECCN) 5D002.C.1, which includes information security
- software using or performing cryptographic functions with asymmetric
- algorithms. The form and manner of this Apache Software Foundation
- distribution makes it eligible for export under the License Exception
- ENC Technology Software Unrestricted (TSU) exception (see the BIS
- Export Administration Regulations, Section 740.13) for both object
- code and source code.
-
- The following provides more details on the included cryptographic
- software:
-
- ActiveMQ supports the use of SSL TCP connections when used with
- with a JVM supporting the Java Cryptography extensions
- <http://java.sun.com/javase/technologies/security/>. ActiveMQ does
- not include these libraries itself, but is designed to use them.
-