[incubator-myriad] Git Push Summary

2016-02-24 Thread kensipe 
Repository: incubator-myriad
Updated Branches:
  refs/heads/myriadha [deleted] f90a0407c

[incubator-myriad] Git Push Summary

2016-02-24 Thread kensipe 
Repository: incubator-myriad
Updated Branches:
  refs/heads/multi-project [deleted] 82ebfdb06

[1/2] incubator-myriad git commit: MYRIAD-181 Build failure due to dependency on zookeeper test jar

2016-02-24 Thread kensipe 
Repository: incubator-myriad
Updated Branches:
  refs/heads/master bcf277843 -> 9c03f6a0b


MYRIAD-181 Build failure due to dependency on zookeeper test jar


Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/25849b2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/25849b2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/25849b2b

Branch: refs/heads/master
Commit: 25849b2b96c23c52376139782fc623d24c74179a
Parents: 44d73d0
Author: Zachary Jaffee 
Authored: Thu Feb 18 22:09:50 2016 -0800
Committer: Zachary Jaffee 
Committed: Thu Feb 18 22:16:04 2016 -0800

--
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/25849b2b/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 807d117..7e57403 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,8 +67,8 @@ subprojects {
 }
 
 repositories {
-mavenLocal()
 mavenCentral()
+mavenLocal()
 }
 
 dependencies {
@@ -78,7 +78,7 @@ subprojects {
 compile "org.apache.mesos:mesos:${mesosVer}"
 compile 'com.google.code.gson:gson:2.3.1'// marshalling 
between the scheduler and executor
 
-
+testCompile 'org.apache.zookeeper:zookeeper:3.4.6' // to resolve 
temporary mavenlocal issue
 testCompile 'junit:junit:4.12'
 testCompile 'commons-collections:commons-collections:3.2.1'
 }

[3/3] incubator-myriad git commit: This closes: #53 Review: https://github.com/apache/incubator-myriad/pull/53

2016-02-24 Thread kensipe 
This closes: #53
Review: https://github.com/apache/incubator-myriad/pull/53


Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/bcf27784
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/bcf27784
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/bcf27784

Branch: refs/heads/master
Commit: bcf277843bdc81d1e8d9f194282c93c51762d937
Parents: 3daab13 c2ff1e6
Author: Ken Sipe 
Authored: Wed Feb 24 12:13:54 2016 -0600
Committer: Ken Sipe 
Committed: Wed Feb 24 12:13:54 2016 -0600

--
 support/apache-release/prepare_rc.sh | 103 +
 support/apache-release/release.sh| 105 ++
 2 files changed, 208 insertions(+)
--

[2/3] incubator-myriad git commit: added import and changed logger to not be static

2016-02-24 Thread kensipe 
added import and changed logger to not be static


Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/e28e1cfe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/e28e1cfe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/e28e1cfe

Branch: refs/heads/master
Commit: e28e1cfee9a7677be7cd2f6c0b3ca58d6a3c9594
Parents: 6f3d349
Author: Ken Sipe 
Authored: Wed Feb 24 12:10:40 2016 -0600
Committer: Ken Sipe 
Committed: Wed Feb 24 12:10:40 2016 -0600

--
 .../java/org/apache/myriad/api/ControllerResource.java | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/e28e1cfe/myriad-scheduler/src/main/java/org/apache/myriad/api/ControllerResource.java
--
diff --git 
a/myriad-scheduler/src/main/java/org/apache/myriad/api/ControllerResource.java 
b/myriad-scheduler/src/main/java/org/apache/myriad/api/ControllerResource.java
index e1d136e..1c2be91 100644
--- 
a/myriad-scheduler/src/main/java/org/apache/myriad/api/ControllerResource.java
+++ 
b/myriad-scheduler/src/main/java/org/apache/myriad/api/ControllerResource.java
@@ -19,22 +19,23 @@
 package org.apache.myriad.api;
 
 import com.codahale.metrics.annotation.Timed;
+import org.apache.myriad.scheduler.MyriadOperations;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javax.inject.Inject;
-import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import org.apache.myriad.scheduler.MyriadOperations;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * RESTful API to resource manager
  */
 @Path("/framework")
 public class ControllerResource {
-  private static final Logger LOGGER = 
LoggerFactory.getLogger(ControllerResource.class);
+  private final Logger logger = LoggerFactory.getLogger(getClass());
 
   private MyriadOperations myriadOperations;
 
@@ -53,7 +54,7 @@ public class ControllerResource {
   @Path("/shutdown/framework")
   @Produces(MediaType.APPLICATION_JSON)
   public Response shutdownFramework() {
-LOGGER.info("shutdownterminating framework... ");
+logger.info("shutdownterminating framework... ");
 
 myriadOperations.shutdownFramework();

[3/3] incubator-myriad git commit: This closes: #58 Review: https://github.com/apache/incubator-myriad/pull/58

2016-02-24 Thread kensipe 
This closes: #58
Review: https://github.com/apache/incubator-myriad/pull/58


Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/3daab13e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/3daab13e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/3daab13e

Branch: refs/heads/master
Commit: 3daab13e5257c384f58c496c501b64278711d361
Parents: 8cad533 e28e1cf
Author: Ken Sipe 
Authored: Wed Feb 24 12:10:57 2016 -0600
Committer: Ken Sipe 
Committed: Wed Feb 24 12:10:57 2016 -0600

--
 .../org/apache/myriad/api/ControllerResource.java| 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)
--

[1/3] incubator-myriad git commit: Added 0.1.0 release info to news and downloads

2016-02-24 Thread kensipe 
Repository: incubator-myriad
Updated Branches:
  refs/heads/master 44d73d080 -> 8cad53316


Added 0.1.0 release info to news and downloads


Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/397c2013
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/397c2013
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/397c2013

Branch: refs/heads/master
Commit: 397c20136829b64cc83ce733fe5ceaa83a15d691
Parents: 06f6ca4
Author: smarella 
Authored: Fri Dec 11 20:14:42 2015 -0800
Committer: smarella 
Committed: Sat Dec 12 01:57:12 2015 -0800

--
 .../2015-12-09-myriad-0.1.0-incubating-released.md | 13 +
 website/downloads/index.md | 12 +---
 2 files changed, 22 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/397c2013/website/_posts/2015-12-09-myriad-0.1.0-incubating-released.md
--
diff --git a/website/_posts/2015-12-09-myriad-0.1.0-incubating-released.md 
b/website/_posts/2015-12-09-myriad-0.1.0-incubating-released.md
new file mode 100644
index 000..f393a71
--- /dev/null
+++ b/website/_posts/2015-12-09-myriad-0.1.0-incubating-released.md
@@ -0,0 +1,13 @@
+---
+layout: big_card_for_md
+title:  "Apache Myriad 0.1.0 (Incubating) Released"
+date:   2015-12-10 00:00:00
+categories: news
+blurb: "Apache Myriad community releases the first version of Myriad."
+---
+The Apache Myriad community is excited to make the first Apache release of the 
project. Thanks to a diverse community of developers, mentors, Apache members 
and users! 
+
+[Announcement](https://github.com/apache/incubator-myriad)
+
+[Download](/downloads/#latest)
+

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/397c2013/website/downloads/index.md
--
diff --git a/website/downloads/index.md b/website/downloads/index.md
index 97800c0..9de36cf 100644
--- a/website/downloads/index.md
+++ b/website/downloads/index.md
@@ -3,13 +3,19 @@ layout: big_card_for_md
 title: Downloads
 permalink: /downloads/
 ---
-# Under Incubation
+# Download Myriad
+Download the most recent stable release: 
[myriad-0.1.0-incubating](http://www.apache.org/dist/incubator/myriad/myriad-0.1.0-incubating/)
 ([Release 
Notes](https://cwiki.apache.org/confluence/display/MYRIAD/Release+Notes#ReleaseNotes-myriad-0.1.0-incubating))
 
-Apache Myriad is currently under 
[incubation](http://incubator.apache.org/projects/myriad.html) and we have yet 
to produce an official release.
+Once you have downloaded Myriad, follow the [installation and 
configuration](https://cwiki.apache.org/confluence/display/MYRIAD/Installation+and+Configuration)
 instructions, and take a look at the rest of the 
[documentation](https://cwiki.apache.org/confluence/display/MYRIAD).
 
-You can download the [source 
code](https://git-wip-us.apache.org/repos/asf?p=incubator-myriad.git) and [help 
us!]({{ site.baseurl }}/community)
+# Getting the latest code via source control
+The latest codebase can also be downloaded from the Apache git repository at:
+[https://git-wip-us.apache.org/repos/asf/incubator-myriad.git](https://git-wip-us.apache.org/repos/asf/incubator-myriad.git)
 
+A read-only git repository is also mirrored on Github at: 
[https://github.com/apache/incubator-myriad](https://github.com/apache/incubator-myriad)
 
+# Previous releases
+[myriad-0.1.0-incubating](http://www.apache.org/dist/incubator/myriad/myriad-0.1.0-incubating/)
 ([Release 
Notes](https://cwiki.apache.org/confluence/display/MYRIAD/Release+Notes#ReleaseNotes-myriad-0.1.0-incubating))

[2/3] incubator-myriad git commit: Added blog post to announce Myriad 0.1.0

2016-02-24 Thread kensipe 
Added blog post to announce Myriad 0.1.0

- Created separate "news" and "blogs" dirs under _posts
- Included "Blogs" in left side nav and in the footer
- Fixed landing page to show only "news" feeds only
- New blogs added to "_posts/blogs" will be auto picked

This closes: #54
Review: https://github.com/apache/incubator-myriad/pull/54


Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/1f9536f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/1f9536f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/1f9536f2

Branch: refs/heads/master
Commit: 1f9536f2bc47255a95807512645bce9b4945ec7e
Parents: 397c201
Author: smarella 
Authored: Sat Dec 12 01:43:00 2015 -0800
Committer: Ken Sipe 
Committed: Wed Feb 24 11:50:28 2016 -0600

--
 website/_includes/blog.html | 26 
 website/_includes/footer.html   |  1 +
 website/_includes/front_news.html   |  2 +-
 website/_includes/header.html   |  1 +
 website/_includes/page.html |  2 +-
 .../2015-03-01-project-enters-incubation.md | 10 ---
 .../2015-09-25-code-migrated-to-apache-git.md   | 14 
 ...15-12-09-myriad-0.1.0-incubating-released.md | 13 
 ...5-12-09-myriad-0.1.0-release-announcement.md | 67 
 .../2015-03-01-project-enters-incubation.md | 10 +++
 .../2015-09-25-code-migrated-to-apache-git.md   | 14 
 ...15-12-09-myriad-0.1.0-incubating-released.md | 13 
 website/blogs/index.html| 40 
 website/downloads/index.md  |  3 +-
 website/news/index.html |  2 +-
 15 files changed, 177 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/1f9536f2/website/_includes/blog.html
--
diff --git a/website/_includes/blog.html b/website/_includes/blog.html
new file mode 100644
index 000..e59158f
--- /dev/null
+++ b/website/_includes/blog.html
@@ -0,0 +1,26 @@
+{% comment %}
+
+{% endcomment %}
+
+
+  
+{{post.content}}
+  
+

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/1f9536f2/website/_includes/footer.html
--
diff --git a/website/_includes/footer.html b/website/_includes/footer.html
index b1fc14b..40089ad 100644
--- a/website/_includes/footer.html
+++ b/website/_includes/footer.html
@@ -61,6 +61,7 @@ under the License.
 News
 Documentation
 Downloads
+Blogs
 Community
   
 

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/1f9536f2/website/_includes/front_news.html
--
diff --git a/website/_includes/front_news.html 
b/website/_includes/front_news.html
index 63b8b91..2f99090 100644
--- a/website/_includes/front_news.html
+++ b/website/_includes/front_news.html
@@ -23,7 +23,7 @@ under the License.
 
   News
 
-  {% for post in site.posts %}
+  {% for post in site.categories.news %}
   
 {{ post.title }}
   

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/1f9536f2/website/_includes/header.html
--
diff --git a/website/_includes/header.html b/website/_includes/header.html
index 12f1fde..f18aa94 100644
--- a/website/_includes/header.html
+++ b/website/_includes/header.html
@@ -43,6 +43,7 @@ under the License.
 News
 Documentation
 Downloads
+Blogs
 Community
 
   

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/1f9536f2/website/_includes/page.html
--
diff --git a/website/_includes/page.html b/website/_includes/page.html
index 11419e4..66ec1d6 100644
--- a/website/_includes/page.html
+++ b/website/_includes/page.html
@@ -21,7 +21,7 @@ under the License.
 
 
   {{post.title}}
-  
+  
 {{ post.date | date: "%b %-d, %Y" }}{% if post.author %} • {{ 
post.author }}{% endif %}{% if post.meta %} • {{ post.meta }}{% endif %}
 {{ post.content }}
   

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/1f9536f2/website/_posts/2015-03-01-project-enters-incubation.md
--
diff --git a/website/_posts/2015-03-01-project-enters-incubation.md 
b/website/_posts/2015-03-01-project-enters-incubation.md
deleted file mode 100644
index 10c9cb6..000
--- a/website/_posts/2015-03-01-project-enters-incubation.md
+++ /dev/null
@@ -1,10 +0,0 @@

-layout: big_card_for_md
-title: "Project Enters

[2/2] incubator-myriad git commit: This closes: #48 Review: https://github.com/apache/incubator-myriad/pull/48

2015-11-18 Thread kensipe 
This closes: #48
Review: https://github.com/apache/incubator-myriad/pull/48

upgrades gradle build to 2.9


Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/7eceadcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/7eceadcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/7eceadcc

Branch: refs/heads/master
Commit: 7eceadcc35f430cb446bb0900468135dd9ef8522
Parents: 7e54db0 aab1a96
Author: Ken Sipe 
Authored: Wed Nov 18 15:08:12 2015 -0600
Committer: Ken Sipe 
Committed: Wed Nov 18 15:08:12 2015 -0600

--
 gradle/wrapper/gradle-wrapper.jar| Bin 52266 -> 53636 bytes
 gradle/wrapper/gradle-wrapper.properties |  21 ++---
 gradlew  |  10 +++---
 gradlew.bat  |  16 
 4 files changed, 5 insertions(+), 42 deletions(-)
--

[1/2] incubator-myriad git commit: updating gradlew to 2.9 which provides faster incremental builds

2015-11-18 Thread kensipe 
Repository: incubator-myriad
Updated Branches:
  refs/heads/master 7e54db015 -> 7eceadcc3


updating gradlew to 2.9 which provides faster incremental builds


Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/aab1a96e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/aab1a96e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/aab1a96e

Branch: refs/heads/master
Commit: aab1a96eda44a9b1d64daab15aeaa9336cf12c71
Parents: fb93291
Author: Ken Sipe 
Authored: Wed Nov 18 13:13:26 2015 -0600
Committer: Ken Sipe 
Committed: Wed Nov 18 13:13:26 2015 -0600

--
 gradle/wrapper/gradle-wrapper.jar| Bin 52266 -> 53636 bytes
 gradle/wrapper/gradle-wrapper.properties |  21 ++---
 gradlew  |  10 +++---
 gradlew.bat  |  16 
 4 files changed, 5 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/aab1a96e/gradle/wrapper/gradle-wrapper.jar
--
diff --git a/gradle/wrapper/gradle-wrapper.jar 
b/gradle/wrapper/gradle-wrapper.jar
index b5166da..9411448 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and 
b/gradle/wrapper/gradle-wrapper.jar differ

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/aab1a96e/gradle/wrapper/gradle-wrapper.properties
--
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index 020c1bd..f5e1d1a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,23 +1,6 @@
-# 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.
-
-#Wed Jun 10 10:58:12 CDT 2015
+#Wed Nov 18 13:13:12 CST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/aab1a96e/gradlew
--
diff --git a/gradlew b/gradlew
index 91a7e26..9d82f78 100755
--- a/gradlew
+++ b/gradlew
@@ -42,11 +42,6 @@ case "`uname`" in
 ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
 fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
 APP_HOME=`cygpath --path --mixed "$APP_HOME"`
 CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+JAVACMD=`cygpath --unix "$JAVACMD"`
 
 # We build the pattern for arguments to be converted via cygpath
 ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/aab1a96e/gradlew.bat
--
diff --git a/gradlew.bat b/gradlew.bat
index 163987c..8a0b282 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,19 +1,3 @@
-rem Licensed to the Apache Software Foundation (ASF) under one
-rem or more contributor license agreements.  See the NOTICE file
-rem distributed with this work for additional information
-rem regarding copyright ownership.  The ASF licenses this file
-rem to you under the Apache License, Version 2.0 (the
-rem "License"); you may not use this file except in compliance
-rem with the License.  You may obtain a copy of the License at
-rem 
-rem

[01/10] incubator-myriad git commit: Updated LICENSE and NOTICE files per Apache guidelines

2015-10-16 Thread kensipe 
Repository: incubator-myriad
Updated Branches:
  refs/heads/master e18419491 -> 766f7213b


Updated LICENSE and NOTICE files per Apache guidelines


Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/fb8bf1d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/fb8bf1d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/fb8bf1d1

Branch: refs/heads/master
Commit: fb8bf1d10ec4f8b8d7c84134d3ab0c788c03d309
Parents: ae8b7f8
Author: klucar 
Authored: Thu Oct 15 08:26:00 2015 -0400
Committer: klucar 
Committed: Thu Oct 15 08:26:00 2015 -0400

--
 LICENSE | 595 +--
 NOTICE  |  28 +--
 2 files changed, 544 insertions(+), 79 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/fb8bf1d1/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 100491c..c3aaa43 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,55 +1,540 @@
-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,