You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by ch...@apache.org on 2014/12/30 06:29:03 UTC
[3/4] incubator-reef git commit: [REEF-16]: Update the NOTICE, LICENSE,
... to ASF standards
[REEF-16]: Update the NOTICE, LICENSE, ... to ASF standards
This addressed the issue by adding ASF-compliant NOTICE and LICENSE
files, removing old LICENSES.txt and NOTICES.txt, and updating README.md
to meet ASF standards.
JIRA: [REEF-16](https://issues.apache.org/jira/browse/REEF-16)
Pull Request: Closes #40
Author: Byung-Gon Chun <bg...@apache.org>
cherry-picking commit b3ea454.
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/190a508e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/190a508e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/190a508e
Branch: refs/heads/branch-0.10.0-incubating
Commit: 190a508ec21f157a67f9a0e5de1c61ca495a0887
Parents: e5e2a3b
Author: Byung-Gon Chun <bg...@apache.org>
Authored: Mon Dec 29 10:56:23 2014 +0900
Committer: chobrian <ch...@apache.org>
Committed: Tue Dec 30 14:23:10 2014 +0900
----------------------------------------------------------------------
HEADER | 16 ++++
LICENSE | 202 +++++++++++++++++++++++++++++++++++++++++++++
LICENSE.txt | 202 ---------------------------------------------
LICENSE_HEADER.txt | 16 ----
NOTICE | 5 ++
NOTICES.txt | 116 --------------------------
README.md | 105 +++++------------------
reef-tang/LICENSE.txt | 13 ---
reef-tang/NOTICES.txt | 116 --------------------------
reef-tang/README.md | 130 ++++++++++++-----------------
reef-wake/LICENSE.txt | 13 ---
reef-wake/NOTICES.txt | 116 --------------------------
reef-wake/README.md | 65 +++------------
13 files changed, 307 insertions(+), 808 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/HEADER
----------------------------------------------------------------------
diff --git a/HEADER b/HEADER
new file mode 100644
index 0000000..90705e0
--- /dev/null
+++ b/HEADER
@@ -0,0 +1,16 @@
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..7a4a3ea
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index 7a4a3ea..0000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/LICENSE_HEADER.txt
----------------------------------------------------------------------
diff --git a/LICENSE_HEADER.txt b/LICENSE_HEADER.txt
deleted file mode 100644
index 90705e0..0000000
--- a/LICENSE_HEADER.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you 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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..7d1fbe4
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+Apache REEF
+Copyright 2014 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/NOTICES.txt
----------------------------------------------------------------------
diff --git a/NOTICES.txt b/NOTICES.txt
deleted file mode 100644
index dab44ac..0000000
--- a/NOTICES.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-====
- Copyright (C) 2014 Microsoft Corporation
-
- 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.
-====
-
-Third Party Notices
-
-Not Translate or Localize
-
-This file is based on or incorporates material from the projects
-listed below (collectively, "Third Party Code"). Microsoft is not the
-original author of the Third Party Code. The original copyright notice
-and the license, under which Microsoft received such Third Party Code,
-are set forth below. Such licenses and notices are provided for
-informational purposes only. Microsoft, not the third party, licenses
-the Third Party Code to you under the terms set forth in the EULA for
-the Microsoft Product. Microsoft reserves all rights not expressly
-granted under this agreement, whether by implication, estoppel or
-otherwise.
-
-Provided for Informational Purposes Only
-
-----------LICENSE BEGINS HERE-----------------
-
-Apache Hadoop
-
-The Apache Jarkarta Project
-
-Copyright (c) The Apache Software Foundation
-
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you 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
-
---------LICENSE ENDS HERE-------
-
--------LICENSE BEGINS HERE-----
-
-Coda hale-metrics
-
-Copyright (c) 2010-2013 Coda Hale
-
-Apache Software License 2.0
-
-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.
-
---------LICENSE ENDS HERE-------
-
--------LICENSE BEGINS HERE------
-D3.js
-
-D2 Sankey Plugin
-
-Copyright (c) 2013, Michael Bostock
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-* The name Michael Bostock may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--------LICENSE ENDS HERE-------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 44f60fb..961096f 100644
--- a/README.md
+++ b/README.md
@@ -1,92 +1,25 @@
-REEF
-====
+# Apache REEF
-REEF is the Retainable Evaluator Execution Framework. It makes it easier to write applications on top of resource managers (e.g. YARN). It is released under the Apache 2.0 license. To get started, there is a [Tutorial](https://github.com/Microsoft-CISL/REEF/wiki/How-to-download-and-compile-REEF). We also have a [website](http://www.reef-project.org/)
+REEF (Retainable Evaluator Execution Framework) is a scale-out computing fabric
+that makes it easier to write Big Data applications on top of resource managers
+(e.g., Apache YARN and Mesos). For example, Azure Stream Analytics is built on
+REEF and Hadoop. Apache REEF is currently undergoing incubation at the [Apache
+Software Foundation](http://www.apache.org/).
+<http://reef.incubator.apache.org/>
-THIRD PARTY SOFTWARE.
----------------------
-This software is built using Maven. Maven allows you to obtain software libraries from other sources as part of the build process. Those libraries are offered and distributed by third parties under their own license terms. Microsoft is not developing, distributing or licensing those libraries to you, but instead, as a convenience, enables you touse this software to obtain those libraries directly from the creators or providers. By using the software, you acknowledge and agree that you are nbtaining the libraries directly from the third parties and under separate license terms, and that it is your responsibility to locate, understand and comply with any such license terms. Microsoft grants you no license rights for third-party software or libraries that are obtained using this software.
+## Online Documentation
-The list of libraries pulled in this way includes, but is not limited to:
+You can find the latest REEF documentation, including tutorials, on the
+[project web page](http://reef.incubator.apache.org/). This README file
+contains only basic setup instructions.
- * aopalliance:aopalliance:jar:1.0:compile
- * asm:asm:jar:3.3.1:compile
- * cglib:cglib:jar:2.2.2:compile
- * com.google.guava:guava:jar:15.0:compile
- * com.google.inject:guice:jar:3.0:compile
- * com.google.inject.extensions:guice-servlet:jar:3.0:compile
- * com.google.protobuf:protobuf-java:jar:2.5.0:compile
- * com.jcraft:jsch:jar:0.1.42:compile
- * com.sun.jersey:jersey-client:jar:1.9:compile
- * com.sun.jersey:jersey-core:jar:1.9:compile
- * com.sun.jersey:jersey-grizzly2:jar:1.9:compile
- * com.sun.jersey:jersey-json:jar:1.9:compile
- * com.sun.jersey:jersey-server:jar:1.9:compile
- * com.sun.jersey.contribs:jersey-guice:jar:1.9:compile
- * com.sun.jersey.jersey-test-framework:jersey-test-framework-core:jar:1.9:compile
- * com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:jar:1.9:compile
- * com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile
- * com.thoughtworks.paranamer:paranamer:jar:2.3:compile
- * commons-cli:commons-cli:jar:1.2:compile
- * commons-codec:commons-codec:jar:1.4:compile
- * commons-configuration:commons-configuration:jar:1.9:compile
- * commons-el:commons-el:jar:1.0:runtime
- * commons-httpclient:commons-httpclient:jar:3.1:compile
- * commons-io:commons-io:jar:2.1:compile
- * commons-lang:commons-lang:jar:2.6:compile
- * commons-logging:commons-logging:jar:1.1.1:compile
- * commons-net:commons-net:jar:3.1:compile
- * dom4j:dom4j:jar:1.6.1:compile
- * io.netty:netty:jar:3.5.10.Final:compile
- * javax.activation:activation:jar:1.1:compile
- * javax.inject:javax.inject:jar:1:compile
- * javax.servlet:javax.servlet-api:jar:3.0.1:compile
- * javax.servlet:servlet-api:jar:2.5:compile
- * javax.servlet.jsp:jsp-api:jar:2.1:runtime
- * javax.xml.bind:jaxb-api:jar:2.2.2:compile
- * jdk.tools:jdk.tools:jar:1.7:system
- * junit:junit:jar:4.11:test
- * log4j:log4j:jar:1.2.17:compile
- * net.java.dev.jets3t:jets3t:jar:0.6.1:compile
- * org.apache.avro:avro:jar:1.7.4:compile
- * org.apache.commons:commons-compress:jar:1.4.1:compile
- * org.apache.commons:commons-math:jar:2.1:compile
- * org.apache.hadoop:hadoop-annotations:jar:2.2.0:compile
- * org.apache.hadoop:hadoop-auth:jar:2.2.0:compile
- * org.apache.hadoop:hadoop-common:jar:2.2.0:compile
- * org.apache.hadoop:hadoop-yarn-api:jar:2.2.0:compile
- * org.apache.hadoop:hadoop-yarn-client:jar:2.2.0:compile
- * org.apache.hadoop:hadoop-yarn-common:jar:2.2.0:compile
- * org.apache.zookeeper:zookeeper:jar:3.4.5:compile
- * org.codehaus.jackson:jackson-core-asl:jar:1.8.8:compile
- * org.codehaus.jackson:jackson-jaxrs:jar:1.8.3:compile
- * org.codehaus.jackson:jackson-mapper-asl:jar:1.8.8:compile
- * org.codehaus.jackson:jackson-xc:jar:1.8.3:compile
- * org.codehaus.jettison:jettison:jar:1.1:compile
- * org.glassfish:javax.servlet:jar:3.1:compile
- * org.glassfish.external:management-api:jar:3.0.0-b012:compile
- * org.glassfish.gmbal:gmbal-api-only:jar:3.0.0-b023:compile
- * org.glassfish.grizzly:grizzly-framework:jar:2.1.2:compile
- * org.glassfish.grizzly:grizzly-http:jar:2.1.2:compile
- * org.glassfish.grizzly:grizzly-http-server:jar:2.1.2:compile
- * org.glassfish.grizzly:grizzly-http-servlet:jar:2.1.2:compile
- * org.glassfish.grizzly:grizzly-rcm:jar:2.1.2:compile
- * org.hamcrest:hamcrest-core:jar:1.3:test
- * org.javassist:javassist:jar:3.16.1-GA:compile
- * org.mockito:mockito-core:jar:1.9.5:test
- * org.mortbay.jetty:jetty:jar:6.1.26:compile
- * org.mortbay.jetty:jetty-util:jar:6.1.26:compile
- * org.objenesis:objenesis:jar:1.0:test
- * org.reflections:reflections:jar:0.9.9-RC1:compile
- * org.slf4j:slf4j-api:jar:1.7.5:compile
- * org.slf4j:slf4j-log4j12:jar:1.7.5:compile
- * org.tukaani:xz:jar:1.0:compile
- * org.xerial.snappy:snappy-java:jar:1.0.4.1:compile
- * stax:stax-api:jar:1.0.1:compile
- * tomcat:jasper-compiler:jar:5.5.23:runtime
- * tomcat:jasper-runtime:jar:5.5.23:runtime
- * xml-apis:xml-apis:jar:1.0.b2:compile
- * xmlenc:xmlenc:jar:0.52:compile
+## Building REEF
+
+REEF is built using [Apache Maven](http://maven.apache.org/).
+To build REEF and its example programs, run:
+
+ mvn -DskipTests clean install
+
+More detailed documentation is available from the project site.
-An up-to-date list of dependencies pulled in this way can be generated via `mvn dependency:list` on the command line.
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/reef-tang/LICENSE.txt
----------------------------------------------------------------------
diff --git a/reef-tang/LICENSE.txt b/reef-tang/LICENSE.txt
deleted file mode 100644
index 8342284..0000000
--- a/reef-tang/LICENSE.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (C) 2014 Microsoft Corporation
-
-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.
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/reef-tang/NOTICES.txt
----------------------------------------------------------------------
diff --git a/reef-tang/NOTICES.txt b/reef-tang/NOTICES.txt
deleted file mode 100644
index dab44ac..0000000
--- a/reef-tang/NOTICES.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-====
- Copyright (C) 2014 Microsoft Corporation
-
- 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.
-====
-
-Third Party Notices
-
-Not Translate or Localize
-
-This file is based on or incorporates material from the projects
-listed below (collectively, "Third Party Code"). Microsoft is not the
-original author of the Third Party Code. The original copyright notice
-and the license, under which Microsoft received such Third Party Code,
-are set forth below. Such licenses and notices are provided for
-informational purposes only. Microsoft, not the third party, licenses
-the Third Party Code to you under the terms set forth in the EULA for
-the Microsoft Product. Microsoft reserves all rights not expressly
-granted under this agreement, whether by implication, estoppel or
-otherwise.
-
-Provided for Informational Purposes Only
-
-----------LICENSE BEGINS HERE-----------------
-
-Apache Hadoop
-
-The Apache Jarkarta Project
-
-Copyright (c) The Apache Software Foundation
-
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you 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
-
---------LICENSE ENDS HERE-------
-
--------LICENSE BEGINS HERE-----
-
-Coda hale-metrics
-
-Copyright (c) 2010-2013 Coda Hale
-
-Apache Software License 2.0
-
-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.
-
---------LICENSE ENDS HERE-------
-
--------LICENSE BEGINS HERE------
-D3.js
-
-D2 Sankey Plugin
-
-Copyright (c) 2013, Michael Bostock
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-* The name Michael Bostock may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--------LICENSE ENDS HERE-------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/reef-tang/README.md
----------------------------------------------------------------------
diff --git a/reef-tang/README.md b/reef-tang/README.md
index 0f79c5b..9b72712 100644
--- a/reef-tang/README.md
+++ b/reef-tang/README.md
@@ -95,18 +95,18 @@ Tang encourages applications to use Plain Old Java Objects (POJOs), and emphasiz
Tang aims to provide end users with error messages as early as possible, and encourages developers to throw exceptions inside of constructors. This allows it to automatically provide additional information to end-users when things go wrong:
```
-Exception in thread "main" com.microsoft.tang.exceptions.InjectionException: Could not invoke constructor: new Timer(Integer Seconds = -1)
- at com.microsoft.tang.implementation.java.InjectorImpl.injectFromPlan(InjectorImpl.java:585)
- at com.microsoft.tang.implementation.java.InjectorImpl.getInstance(InjectorImpl.java:449)
- at com.microsoft.tang.implementation.java.InjectorImpl.getInstance(InjectorImpl.java:466)
- at com.microsoft.tang.examples.Timer.main(Timer.java:48)
+Exception in thread "main" org.apache.reef.tang.exceptions.InjectionException: Could not invoke constructor: new Timer(Integer Seconds = -1)
+ at org.apache.reef.tang.implementation.java.InjectorImpl.injectFromPlan(InjectorImpl.java:585)
+ at org.apache.reef.tang.implementation.java.InjectorImpl.getInstance(InjectorImpl.java:449)
+ at org.apache.reef.tang.implementation.java.InjectorImpl.getInstance(InjectorImpl.java:466)
+ at org.apache.reef.tang.examples.Timer.main(Timer.java:48)
Caused by: java.lang.IllegalArgumentException: Cannot sleep for negative time!
- at com.microsoft.tang.examples.Timer.<init>(Timer.java:25)
+ at org.apache.reef.tang.examples.Timer.<init>(Timer.java:25)
at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
at sun.reflect.NativeConstructorAccessorImpl.newInstance(Unknown Source)
at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(Unknown Source)
at java.lang.reflect.Constructor.newInstance(Unknown Source)
- at com.microsoft.tang.implementation.java.InjectorImpl.injectFromPlan(InjectorImpl.java:569)
+ at org.apache.reef.tang.implementation.java.InjectorImpl.injectFromPlan(InjectorImpl.java:569)
... 3 more
```
@@ -117,9 +117,9 @@ package com.example;
import javax.inject.Inject;
-import com.microsoft.tang.annotations.Name;
-import com.microsoft.tang.annotations.NamedParameter;
-import com.microsoft.tang.annotations.Parameter;
+import org.apache.reef.tang.annotations.Name;
+import org.apache.reef.tang.annotations.NamedParameter;
+import org.apache.reef.tang.annotations.Parameter;
public class Timer {
@NamedParameter(default_value="10",
@@ -148,7 +148,7 @@ A few things happened here. First, we create the new configuration parameter by
All instances of `Name` must be annotated with `@NamedParameter`, which takes the following optional parameters:
* `default_value`: The default value of the constructor parameter, encoded as a string. Tang will parse this value (and ones in config files and on the command line), and pass it into the constructor. For convenience Tang includes a number of helper variants of default value. `default_class` takes a Class (instead of a String), while `default_values` and `default_classes` take sets of values.
- * `short_name`: The name of the command line option associated with this parameter. If omitted, no command line option will be created. Short names must be registered by calling `registerShortName()` on the instance of `com.microsoft.tang.formats.CommandLine` that will process the command line options.
+ * `short_name`: The name of the command line option associated with this parameter. If omitted, no command line option will be created. Short names must be registered by calling `registerShortName()` on the instance of `org.apache.reef.tang.formats.CommandLine` that will process the command line options.
* `doc` (optional): Human readable documentation that describes the purpose of the parameter.
Tang only invokes constructors that have been annotated with `@Inject`. This allows injectable constructors to coexist with ones that should not be invoked via dependency injection (such as ones with destructive side effects, or that expect `null` references). Constructor parameters must not be ambiguous. If two parameters in the same constructor have the same type, then they must be annotated with `@Parameter`, which associates a named parameter with the argument. Furthermore, two parameters to the same constructor cannot have the same name. This allows Tang to safely invoke constructors without exposing low level details (such as parameter ordering) as configuration options.
@@ -168,24 +168,24 @@ The process of instantiting an object with Tang is called _injection_. As with
```java
-package com.microsoft.tang.examples.timer;
+package org.apache.reef.tang.examples.timer;
import javax.inject.Inject;
-import com.microsoft.tang.Configuration;
-import com.microsoft.tang.Tang;
+import org.apache.reef.tang.Configuration;
+import org.apache.reef.tang.Tang;
-import com.microsoft.tang.annotations.DefaultImplementation;
-import com.microsoft.tang.annotations.Name;
-import com.microsoft.tang.annotations.NamedParameter;
-import com.microsoft.tang.annotations.Parameter;
+import org.apache.reef.tang.annotations.DefaultImplementation;
+import org.apache.reef.tang.annotations.Name;
+import org.apache.reef.tang.annotations.NamedParameter;
+import org.apache.reef.tang.annotations.Parameter;
-import com.microsoft.tang.exceptions.BindException;
-import com.microsoft.tang.exceptions.InjectionException;
+import org.apache.reef.tang.exceptions.BindException;
+import org.apache.reef.tang.exceptions.InjectionException;
-import com.microsoft.tang.formats.ConfigurationModule;
-import com.microsoft.tang.formats.ConfigurationModuleBuilder;
-import com.microsoft.tang.formats.OptionalParameter;
+import org.apache.reef.tang.formats.ConfigurationModule;
+import org.apache.reef.tang.formats.ConfigurationModuleBuilder;
+import org.apache.reef.tang.formats.OptionalParameter;
@DefaultImplementation(TimerImpl.class)
public interface Timer {
@@ -258,9 +258,9 @@ Again, there are a few things going on here:
- They provide Java APIs that expose `OptionalParameter`, `RequiredParameter`, `OptionalImplementation`, `RequiredImpementation` fields. These fields tell users of the ConfigurationModule which subsystems of the application require which configuration parameters, and allow the author of the ConfigurationModule to use JavaDoc to document the parameters they export.
- Finally, because ConfigurationModule data structures are populated at class load time (before the application begins to run), they can be inspected by Tang's static analysis tools.
-These tools are provided by `com.microsoft.tang.util.Tint`, which is included by default in all Tang builds. As long as Tang is on the classpath, invoking:
+These tools are provided by `org.apache.reef.tang.util.Tint`, which is included by default in all Tang builds. As long as Tang is on the classpath, invoking:
```
-java com.microsoft.tang.util.Tint --doc tangdoc.html
+java org.apache.reef.tang.util.Tint --doc tangdoc.html
```
will perform full static analysis of all classes the class path, and emit a nicely formatted HTML document. The documentation generated by Tint includes cross-references between configuration options, interfaces, classes, and the `ConfigurationModules` that use and set them.
@@ -272,24 +272,24 @@ Note that this documentation is generated before the application code runs, so i
Here are some sample Tint errors. These (and others) can be run by passing `--tang-tests` into Tint, and ensuring that Tang's unit tests are on the class path.:
```
-interface com.microsoft.tang.MyEventHandlerIface declares its default implementation to be non-subclass class com.microsoft.tang.MyEventHandler
-class com.microsoft.tang.WaterBottleName defines a default class com.microsoft.tang.GasCan with a type that does not extend its target's type com.microsoft.tang.Bottle<com.microsoft.tang.Water>
-Named parameters com.microsoft.tang.examples.Timer$Seconds and com.microsoft.tang.examples.TimerV1$Seconds have the same short name: sec
-Named parameter com.microsoft.tang.implementation.AnnotatedNameMultipleInterfaces implements multiple interfaces. It is only allowed to implement Name<T>
-Found illegal @NamedParameter com.microsoft.tang.implementation.AnnotatedNotName does not implement Name<?>
-interface com.microsoft.tang.implementation.BadIfaceDefault declares its default implementation to be non-subclass class java.lang.String
-class com.microsoft.tang.implementation.BadName defines a default class java.lang.Integer with a raw type that does not extend of its target's raw type class java.lang.String
-Named parameter com.microsoft.tang.implementation.BadParsableDefaultClass defines default implementation for parsable type java.lang.String
-Class com.microsoft.tang.implementation.DanglingUnit has an @Unit annotation, but no non-static inner classes. Such @Unit annotations would have no effect, and are therefore disallowed.
-Cannot @Inject non-static member class unless the enclosing class an @Unit. Nested class is:com.microsoft.tang.implementation.InjectNonStaticLocalType$NonStaticLocal
-Named parameter com.microsoft.tang.implementation.NameWithConstructor has a constructor. Named parameters must not declare any constructors.
+interface org.apache.reef.tang.MyEventHandlerIface declares its default implementation to be non-subclass class org.apache.reef.tang.MyEventHandler
+class org.apache.reef.tang.WaterBottleName defines a default class org.apache.reef.tang.GasCan with a type that does not extend its target's type org.apache.reef.tang.Bottle<org.apache.reef.tang.Water>
+Named parameters org.apache.reef.tang.examples.Timer$Seconds and org.apache.reef.tang.examples.TimerV1$Seconds have the same short name: sec
+Named parameter org.apache.reef.tang.implementation.AnnotatedNameMultipleInterfaces implements multiple interfaces. It is only allowed to implement Name<T>
+Found illegal @NamedParameter org.apache.reef.tang.implementation.AnnotatedNotName does not implement Name<?>
+interface org.apache.reef.tang.implementation.BadIfaceDefault declares its default implementation to be non-subclass class java.lang.String
+class org.apache.reef.tang.implementation.BadName defines a default class java.lang.Integer with a raw type that does not extend of its target's raw type class java.lang.String
+Named parameter org.apache.reef.tang.implementation.BadParsableDefaultClass defines default implementation for parsable type java.lang.String
+Class org.apache.reef.tang.implementation.DanglingUnit has an @Unit annotation, but no non-static inner classes. Such @Unit annotations would have no effect, and are therefore disallowed.
+Cannot @Inject non-static member class unless the enclosing class an @Unit. Nested class is:org.apache.reef.tang.implementation.InjectNonStaticLocalType$NonStaticLocal
+Named parameter org.apache.reef.tang.implementation.NameWithConstructor has a constructor. Named parameters must not declare any constructors.
Named parameter type mismatch. Constructor expects a java.lang.String but Foo is a java.lang.Integer
-public com.microsoft.tang.implementation.NonInjectableParam(int) is not injectable, but it has an @Parameter annotation.
-Detected explicit constructor in class enclosed in @Unit com.microsoft.tang.implementation.OuterUnitBad$InA Such constructors are disallowed.
-Repeated constructor parameter detected. Cannot inject constructor com.microsoft.tang.implementation.RepeatConstructorArg(int,int)
-Named parameters com.microsoft.tang.implementation.ShortNameFooA and com.microsoft.tang.implementation.ShortNameFooB have the same short name: foo
-Named parameter com.microsoft.tang.implementation.UnannotatedName is missing its @NamedParameter annotation.
-Field com.microsoft.tang.formats.MyMissingBindConfigurationModule.BAD_CONF: Found declared options that were not used in binds: { FOO_NESS }
+public org.apache.reef.tang.implementation.NonInjectableParam(int) is not injectable, but it has an @Parameter annotation.
+Detected explicit constructor in class enclosed in @Unit org.apache.reef.tang.implementation.OuterUnitBad$InA Such constructors are disallowed.
+Repeated constructor parameter detected. Cannot inject constructor org.apache.reef.tang.implementation.RepeatConstructorArg(int,int)
+Named parameters org.apache.reef.tang.implementation.ShortNameFooA and org.apache.reef.tang.implementation.ShortNameFooB have the same short name: foo
+Named parameter org.apache.reef.tang.implementation.UnannotatedName is missing its @NamedParameter annotation.
+Field org.apache.reef.tang.formats.MyMissingBindConfigurationModule.BAD_CONF: Found declared options that were not used in binds: { FOO_NESS }
```
Injecting objects with `getInstance()`
@@ -352,12 +352,12 @@ Tang also provides a lower level configurtion API for applications that need mor
```java
...
-import com.microsoft.tang.Tang;
-import com.microsoft.tang.ConfigurationBuilder;
-import com.microsoft.tang.Configuration;
-import com.microsoft.tang.Injector;
-import com.microsoft.tang.exceptions.BindException;
-import com.microsoft.tang.exceptions.InjectionException;
+import org.apache.reef.tang.Tang;
+import org.apache.reef.tang.ConfigurationBuilder;
+import org.apache.reef.tang.Configuration;
+import org.apache.reef.tang.Injector;
+import org.apache.reef.tang.exceptions.BindException;
+import org.apache.reef.tang.exceptions.InjectionException;
...
public static void main(String[] args) throws BindException, InjectionException {
@@ -527,8 +527,8 @@ InjectionPlan objects explain what Tang would do to instantiate a new object, bu
Add the following lines to the Timer example;
````java
-import com.microsoft.tang.implementation.InjectionPlan;
-import com.microsoft.tang.implementation.InjectorImpl;
+import org.apache.reef.tang.implementation.InjectionPlan;
+import org.apache.reef.tang.implementation.InjectorImpl;
...
InjectorImpl injector = (InjectorImpl)tang.newInjector(conf);
InjectionPlan<Timer> ip = injector.getInjectionPlan(Timer.class);
@@ -544,7 +544,7 @@ Number of plans:1
InjectionPlan objects can be serialized to protocol buffers. The following file documents their format:
-https://github.com/Microsoft-CISL/TANG/blob/master/tang/src/main/proto/injection_plan.proto
+https://github.com/apache/incubator-reef/blob/master/reef-tang/tang/src/main/proto/injection_plan.proto
### ClassHierachy
@@ -554,33 +554,9 @@ Internally, in the example above, TypeHierarchy walks the class definition for T
ClassHierarchy objects can be serialized to protocol buffers. The following file documents their format:
-https://github.com/Microsoft-CISL/TANG/blob/master/tang/src/main/proto/class_hierarchy.proto
+https://github.com/apache/incubator-reef/blob/master/reef-tang/tang/src/main/proto/class_hierarchy.proto
The java interfaces are available in this package:
-https://github.com/Microsoft-CISL/TANG/tree/master/tang/src/main/java/com/microsoft/tang/types
-
-## THIRD PARTY SOFTWARE
-This software is built using Maven. Maven allows you to obtain software libraries from other sources as part of the build process. Those libraries are offered and distributed by third parties under their own license terms. Microsoft is not developing, distributing or licensing those libraries to you, but instead, as a convenience, enables you to use this software to obtain those libraries directly from the creators or providers. By using the software, you acknowledge and agree that you are obtaining the libraries directly from the third parties and under separate license terms, and that it is your responsibility to locate, understand and comply with any such license terms. Microsoft grants you no license rights for third-party software or libraries that are obtained using this software.
-
-The list of libraries pulled in this way includes, but is not limited to:
-
- * com.google.code.findbugs:jsr305:jar:1.3.9:compile
- * com.google.guava:guava:jar:11.0.2:compile
- * com.google.protobuf:protobuf-java:jar:2.5.0:compile
- * commons-cli:commons-cli:jar:1.2:compile
- * commons-configuration:commons-configuration:jar:1.9:compile
- * commons-lang:commons-lang:jar:2.6:compile
- * commons-logging:commons-logging:jar:1.1.1:compile
- * dom4j:dom4j:jar:1.6.1:compile
- * javax.inject:javax.inject:jar:1:compile
- * junit:junit:jar:4.10:test
- * org.hamcrest:hamcrest-core:jar:1.1:test
- * org.javassist:javassist:jar:3.16.1-GA:compile
- * org.mockito:mockito-core:jar:1.9.0:test
- * org.objenesis:objenesis:jar:1.0:test
- * org.reflections:reflections:jar:0.9.9-RC1:compile
- * xml-apis:xml-apis:jar:1.0.b2:compile
-
-An up-to-date list of dependencies pulled in this way can be generated via `mvn dependency:list` on the command line.
+https://github.com/apache/incubator-reef/tree/master/reef-tang/tang/src/main/java/org/apache/reef/tang/types
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/reef-wake/LICENSE.txt
----------------------------------------------------------------------
diff --git a/reef-wake/LICENSE.txt b/reef-wake/LICENSE.txt
deleted file mode 100644
index 8342284..0000000
--- a/reef-wake/LICENSE.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (C) 2014 Microsoft Corporation
-
-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.
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/reef-wake/NOTICES.txt
----------------------------------------------------------------------
diff --git a/reef-wake/NOTICES.txt b/reef-wake/NOTICES.txt
deleted file mode 100644
index dab44ac..0000000
--- a/reef-wake/NOTICES.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-====
- Copyright (C) 2014 Microsoft Corporation
-
- 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.
-====
-
-Third Party Notices
-
-Not Translate or Localize
-
-This file is based on or incorporates material from the projects
-listed below (collectively, "Third Party Code"). Microsoft is not the
-original author of the Third Party Code. The original copyright notice
-and the license, under which Microsoft received such Third Party Code,
-are set forth below. Such licenses and notices are provided for
-informational purposes only. Microsoft, not the third party, licenses
-the Third Party Code to you under the terms set forth in the EULA for
-the Microsoft Product. Microsoft reserves all rights not expressly
-granted under this agreement, whether by implication, estoppel or
-otherwise.
-
-Provided for Informational Purposes Only
-
-----------LICENSE BEGINS HERE-----------------
-
-Apache Hadoop
-
-The Apache Jarkarta Project
-
-Copyright (c) The Apache Software Foundation
-
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you 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
-
---------LICENSE ENDS HERE-------
-
--------LICENSE BEGINS HERE-----
-
-Coda hale-metrics
-
-Copyright (c) 2010-2013 Coda Hale
-
-Apache Software License 2.0
-
-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.
-
---------LICENSE ENDS HERE-------
-
--------LICENSE BEGINS HERE------
-D3.js
-
-D2 Sankey Plugin
-
-Copyright (c) 2013, Michael Bostock
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-* The name Michael Bostock may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--------LICENSE ENDS HERE-------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/190a508e/reef-wake/README.md
----------------------------------------------------------------------
diff --git a/reef-wake/README.md b/reef-wake/README.md
index 4ea6499..0b56cf0 100644
--- a/reef-wake/README.md
+++ b/reef-wake/README.md
@@ -23,7 +23,7 @@ Wake is completely push based. This eliminates the need for push and pull based
Systems such as Rx allow event handlers to be dynamically registered and torn down at runtime, allowing applications to evolve over time. This leads to complicated setup and teardown protocols, where event handlers need to reason about the state of upstream and downstream handlers, both during setup and teardown, but also when routing messages at runtime. It also encourages design patterns such as dynamic event dispatching that break standard compiler optimizations. In contrast, Wake applications consist of immutable graphs of event handlers that are built up from sink to source. This ensures that, once an event handler has been instantiated, all downstream handlers are ready to receive messages.
-Wake is designed to work with [Tang](https://github.com/Microsoft-CISL/Tang/), a dependency injection system that focuses on configuration and debuggability. This makes it extremely easy to wire up complicated graphs of event handling logic. In addition to making it easy to build up event-driven applications, Tang provides a range of static analysis tools and provides a simple aspect-style programming facility that supports Wake's latency and throughput profilers.
+Wake is designed to work with Tang, a dependency injection system that focuses on configuration and debuggability. This makes it extremely easy to wire up complicated graphs of event handling logic. In addition to making it easy to build up event-driven applications, Tang provides a range of static analysis tools and provides a simple aspect-style programming facility that supports Wake's latency and throughput profilers.
Core API
@@ -31,7 +31,7 @@ Core API
### Event Handlers
-Wake provides two APIs for event handler implementations. The first is the [EventHandler](wake/src/main/java/com/microsoft/wake/EventHandler.java) interface:
+Wake provides two APIs for event handler implementations. The first is the [EventHandler](wake/src/main/java/org/apache/reef/wake/EventHandler.java) interface:
```java
public interface EventHandler<T> {
void onNext(T value);
@@ -39,7 +39,7 @@ public interface EventHandler<T> {
```
Callers of `onNext()` should assume that it is asynchronous, and that it always succeeds. Unrecoverable errors should be reported by throwing a runtime exception (which should not be caught, and will instead take down the process). Recoverable errors are reported by invoking an event handler that contains the appropriate error handling logic.
-The latter approach can be implemented by registering separate event handlers for each type of error. However, for convenience, it is formalized in Wake's simplified version of the Rx [Observer](wake/src/main/java/com/microsoft/wake/rx/Observer.java) interface:
+The latter approach can be implemented by registering separate event handlers for each type of error. However, for convenience, it is formalized in Wake's simplified version of the Rx [Observer](wake/src/main/java/org/apache/reef/wake/rx/Observer.java) interface:
```java
public interface Observer<T> {
void onNext(final T value);
@@ -55,17 +55,17 @@ We chose these invariants because they are simple and easy to enforce. In most
### Stages
-Wake Stages are responsible for resource management. The base [Stage](wake/src/main/java/com/microsoft/wake/Stage.java) interface is fairly simple:
+Wake Stages are responsible for resource management. The base [Stage](wake/src/main/java/org/apache/reef/wake/Stage.java) interface is fairly simple:
```java
public interface Stage extends AutoCloseable { }
```
-The only method it contains is `close()` from auto-closable. This reflects the fact that Wake stages can either contain `EventHandler`s, as [EStage](wake/src/main/java/com/microsoft/wake/EStage.java) implementations do:
+The only method it contains is `close()` from auto-closable. This reflects the fact that Wake stages can either contain `EventHandler`s, as [EStage](wake/src/main/java/org/apache/reef/wake/EStage.java) implementations do:
```java
public interface EStage<T> extends EventHandler<T>, Stage { }
```
-or they can contain `Observable`s, as [RxStage](wake/src/main/java/com/microsoft/wake/rx/RxStage.java) implementations do:
+or they can contain `Observable`s, as [RxStage](wake/src/main/java/org/apache/reef/wake/rx/RxStage.java) implementations do:
```java
public interface RxStage<T> extends Observer<T>, Stage { }
```
@@ -86,50 +86,9 @@ Helper libraries
Wake includes a number of standard library packages:
- - ```com.microsoft.wake.time``` allows events to be scheduled in the future, and notifies the application when it starts and when it is being torn down.
- - ```com.microsoft.wake.remote``` provides networking primitives, including hooks into netty (a high-performance event-based networking library for Java).
- - ```com.microsoft.wake.metrics``` provides implementations of standard latency and throughput instrumentation.
- - ```com.microsoft.wake.profiler``` provides a graphical profiler that automatically instruments Tang-based Wake applications.
-
-Stage implementations
----------------------
-
-Profiling
----------
-
-THIRD PARTY SOFTWARE
---------------------
-This software is built using Maven. Maven allows you
-to obtain software libraries from other sources as part of the build process.
-Those libraries are offered and distributed by third parties under their own
-license terms. Microsoft is not developing, distributing or licensing those
-libraries to you, but instead, as a convenience, enables you to use this
-software to obtain those libraries directly from the creators or providers. By
-using the software, you acknowledge and agree that you are obtaining the
-libraries directly from the third parties and under separate license terms, and
-that it is your responsibility to locate, understand and comply with any such
-license terms. Microsoft grants you no license rights for third-party software
-or libraries that are obtained using this software.
-
-The list of libraries pulled in this way includes, but is not limited to:
-
- * asm:asm:jar:3.3.1:compile
- * cglib:cglib:jar:2.2.2:compile
- * com.google.code.findbugs:jsr305:jar:1.3.9:compile
- * com.google.guava:guava:jar:11.0.2:compile
- * com.google.protobuf:protobuf-java:jar:2.5.0:compile
- * commons-cli:commons-cli:jar:1.2:compile
- * commons-configuration:commons-configuration:jar:1.9:compile
- * commons-lang:commons-lang:jar:2.6:compile
- * commons-logging:commons-logging:jar:1.1.1:compile
- * dom4j:dom4j:jar:1.6.1:compile
- * io.netty:netty:jar:3.5.10.Final:compile
- * javax.inject:javax.inject:jar:1:compile
- * junit:junit:jar:4.10:test
- * org.hamcrest:hamcrest-core:jar:1.1:test
- * org.javassist:javassist:jar:3.16.1-GA:compile
- * org.reflections:reflections:jar:0.9.9-RC1:compile
- * xml-apis:xml-apis:jar:1.0.b2:compile
-
-
-An up-to-date list of dependencies pulled in this way can be generated via `mvn dependency:list` on the command line.
+ - ```org.apache.reef.wake.time``` allows events to be scheduled in the future, and notifies the application when it starts and when it is being torn down.
+ - ```org.apache.reef.wake.remote``` provides networking primitives, including hooks into netty (a high-performance event-based networking library for Java).
+ - ```org.apache.reef.wake.metrics``` provides implementations of standard latency and throughput instrumentation.
+ - ```org.apache.reef.wake.profiler``` provides a graphical profiler that automatically instruments Tang-based Wake applications.
+
+