You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/04/21 22:50:22 UTC

[01/19] incubator-brooklyn git commit: Add Licensing Considerations page to the developer's guide

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master c4ca5b683 -> 7b97cee1e


Add Licensing Considerations page to the developer's guide


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

Branch: refs/heads/master
Commit: 5ae0d4ec830119f613b8915c1bdaa7e097a306d5
Parents: 4338a8f
Author: Richard Downer <ri...@apache.org>
Authored: Thu Apr 16 15:49:56 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Apr 16 16:01:00 2015 +0100

----------------------------------------------------------------------
 docs/guide/dev/code/licensing.md | 116 ++++++++++++++++++++++++++++++++++
 docs/guide/dev/index.md          |   1 +
 2 files changed, 117 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5ae0d4ec/docs/guide/dev/code/licensing.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/code/licensing.md b/docs/guide/dev/code/licensing.md
new file mode 100644
index 0000000..e2a7ef5
--- /dev/null
+++ b/docs/guide/dev/code/licensing.md
@@ -0,0 +1,116 @@
+---
+title: License Considerations
+layout: website-normal
+---
+
+The Apache Software Foundation, quite rightly, place a high standard on code provenance and license compliance. The
+Apache license is flexible and compatible with many other types of license, meaning there is generally little problem
+with incorporating other open source works into Brooklyn (with GPL being the notable exception). However diligence is
+required to ensure that the project is legally sound, and third parties are rightfully credited where appropriate.
+
+This page is an interpretation of the [Apache Legal Previously Asked Questions](http://www.apache.org/legal/resolved.html)
+page as it specifically applies to the Brooklyn project, such as how we organise our code and the releases that we make.
+However this page is not authoritative; if there is any conflict between this page and the Previously Asked Questions or
+other Apache Legal authority, they will take precedence over this page.
+
+If you have any doubt, please ask on the Brooklyn mailing list, and/or the Apache Legal mailing list.
+
+
+What code licenses can we bundle?
+---------------------------------
+
+Apache Legal maintains the ["Category A" list](http://www.apache.org/legal/resolved.html#category-a), which is a list
+of licenses that are compatible with the Apache License; that is, code under these licenses can be imported into
+Brooklyn without violating Brooklyn's Apache License nor the code's original license (subject to correctly modifying
+the `LICENSE` and/or `NOTICE` files; see below).
+
+Apache Legal also maintain the ["Category X" list](http://www.apache.org/legal/resolved.html#category-x). Code licensed
+under a Category X license **cannot** be imported into Brooklyn without violating either Brooklyn's Apache license or
+the code's original license.
+
+There is also a ["Category B" list](http://www.apache.org/legal/resolved.html#category-b), which are licenses that are
+compatible with the Apache license only under certain circumstances. In practice, this means that we can declare a
+dependency on a library licensed under a Category B license, and bundle the binary build of the library in our binary
+builds, but we cannot import its source code into the Brooklyn codebase.
+
+If the code you are seeking to import does not appear on any of these lists, check to see if the license content is the
+same as a known license. For example, many projects actually use a BSD license but do not label it as "The BSD License".
+If you are still not certain about the license, please ask on the Brooklyn mailing list, and/or the Apache Legal mailing
+list.
+
+
+About LICENSE and NOTICE files
+------------------------------
+
+Apache Legal requires that *each* artifact that the project releases contains a `LICENSE` and `NOTICE` file that is
+*accurate for the contents of that artifact*. This means that, potentially, **every artifact that Brooklyn releases may
+contain a different `LICENSE` and `NOTICE` file**. In practice, it's not usually that complicated and there are only a
+few variations of these files needed.
+
+Furthermore, *accurate* `LICENSE` and `NOTICE` files means that it correctly attributes the contents of the artifact,
+and it does not contain anything unnecessary. This provision is what prevents us creating a mega LICENSE file and using
+it in every single artifact we release, because in many cases it will contain information that is not relevant to an
+artifact.
+
+What is a correct `LICENSE` and `NOTICE` file?
+
+* A correct `LICENSE` file is one that contains the text of the licence of any part of the code. The Apache Software
+  License V2 will naturally be the first part of this file, as it's the license which we use for all the original code
+  in Brooklyn. If some *Category A* licensed third-party code is bundled with this artifact, then the `LICENSE` file
+  should identify what the third-party code is, and include a copy of its license. For example, if jquery is bundled
+  with a web app, the `LICENSE` file would include a note jquery.js, its copyright and its license (MIT), and include a
+  full copy of the MIT license.
+* A correct `NOTICE` file contains notices required by bundled third-party code above and beyond that which we have
+  already noted in `LICENSE`. In practice modifying `NOTICE` is rarely required beyond the initial note about Apache
+  Brooklyn. See [What Are Required Third-party Notices?](http://www.apache.org/legal/resolved.html#required-third-party-notices)
+  for more information
+
+
+Applying LICENSE and NOTICE files to Brooklyn
+---------------------------------------------
+
+When the Brooklyn project makes a release, we produce and release the following types of artifacts:
+
+1. One source release artifact
+2. One binary release artifact
+3. A large number of Maven release artifacts
+
+Therefore, our source release, our binary release, and every one of our Maven release artifacts, must **each** have
+their own, individually-tailored, `LICENSE` and `NOTICE` files.
+
+### Maven artifacts
+
+Each Maven module will generally produce a JAR file from code under `src/main`, and a JAR file from code under
+`src/test`. (There are some exceptions which may produce different artifacts.)
+
+If the contents of the module are purely Apache Brooklyn original code, and the outputs are JAR files, then *no action
+is required*. The default build process will incorporate a general-purpose `LICENSE` and `NOTICE` file into all built
+JAR files. `LICENSE` will contain just a copy of the Apache Software License v2, and `NOTICE` will contain just the
+module's own notice fragment.
+
+However you will need to take action if either of these conditions are true:
+
+* the module produces an artifact that is **not** a JAR file - for example, the jsgui project produces a WAR file;
+* the module bundles third-party code that requires a change to `LICENSE` and/or `NOTICE`.
+
+In this case you will need to disable the automatic insertion of `LICENSE` and `NOTICE` and insert your own versions
+instead.
+
+For an example of a JAR file with customized `LICENSE`/`NOTICE` files, refer to the `usage/cli` project.
+For an example of a WAR file with customized `LICENSE`/`NOTICE` files, refer to the `usage/jsgui` project.
+
+### The source release
+
+In practice, the source release contains nothing that isn't in the individual produced Maven artifacts (the obvious
+difference about it being source instead of binary isn't relevant). Therefore, the source release `LICENSE` and `NOTICE`
+can be considered to be the union of every Maven artifact's `LICENSE` and `NOTICE`. The amalgamated files are kept in
+the root of the repository.
+
+### The binary release
+
+This is the trickiest one to get right. The binary release includes everything that is in the source and Maven releases,
+**plus every Java dependency of the project**. This means that the binary release is pulling in many additional items,
+each of which have their own license, and which will therefore impact on `LICENSE` and `NOTICE`.
+
+Therefore you must inspect every file that is present in the binary distribution, ascertain its license status, and
+ensure that `LICENSE` and `NOTICE` are correct.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5ae0d4ec/docs/guide/dev/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/index.md b/docs/guide/dev/index.md
index a4f6ef9..95f278e 100644
--- a/docs/guide/dev/index.md
+++ b/docs/guide/dev/index.md
@@ -10,6 +10,7 @@ children:
 - code/
 - { link: "http://github.com/apache/incubator-brooklyn", title: "GitHub" }
 - code/tests.md
+- code/licensing.md
 - tips/
 - tips/logging.md
 - tips/debugging-remote-brooklyn.md


[07/19] incubator-brooklyn git commit: Clean up maven-shade-plugin configuration

Posted by he...@apache.org.
Clean up maven-shade-plugin configuration

Removes the special case for Whirr - since Brooklyn no longer shades
anything involving Whirr, this configuration can be removed.
maven-shade-plugin poorly handles transformers configured in the root
pom and more transformers defined in a module pom so it is best to
avoiding defining transformers in the root pom.


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

Branch: refs/heads/master
Commit: e567366a6197f29c21e32d35cc423c2599962a57
Parents: 6de3d74
Author: Richard Downer <ri...@apache.org>
Authored: Fri Apr 17 09:47:36 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Apr 17 09:47:36 2015 +0100

----------------------------------------------------------------------
 pom.xml                           | 4 ----
 utils/jmx/jmxmp-ssl-agent/pom.xml | 6 ------
 2 files changed, 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e567366a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5b6d1fc..7de32ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -777,10 +777,6 @@
                                         </excludes>
                                     </filter>
                                 </filters>
-                                <transformers>
-                                    <!-- whirr, among others, uses services which need careful attention -->
-                                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                </transformers>
                             </configuration>
                         </execution>
                     </executions>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e567366a/utils/jmx/jmxmp-ssl-agent/pom.xml
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml
index bf1923f..aad0abe 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -73,12 +73,6 @@
                     <artifactId>maven-shade-plugin</artifactId>
                     <configuration>
                         <transformers>
-                            <!-- So we need to copy the transformers configuration out of the root pom, otherwise we
-                               - expose bugs in the plugin. That sucks. -->
-                            <!-- whirr, among others, uses services which need careful attention -->
-                            <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                            <!-- end copy from root pom -->
-
                             <!-- Cut out the license/notice for the unshaded artifact -->
                             <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
                                 <resources>


[10/19] incubator-brooklyn git commit: LICENSE/NOTICE for binary distribution

Posted by he...@apache.org.
LICENSE/NOTICE for binary distribution


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

Branch: refs/heads/master
Commit: f5bf31f58bd3f5f275802f3c60f493124cd7c2fc
Parents: e567366
Author: Richard Downer <ri...@apache.org>
Authored: Fri Apr 17 14:00:07 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Apr 17 14:10:23 2015 +0100

----------------------------------------------------------------------
 .../main/config/build-distribution-archive.xml  |    9 +-
 .../src/main/config/build-distribution-dir.xml  |    9 +-
 usage/dist/src/main/license/LICENSE             | 1691 ++++++++++++++++++
 usage/dist/src/main/license/NOTICE              |    5 +
 4 files changed, 1710 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f5bf31f5/usage/dist/src/main/config/build-distribution-archive.xml
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/config/build-distribution-archive.xml b/usage/dist/src/main/config/build-distribution-archive.xml
index 06c43f4..805d291 100644
--- a/usage/dist/src/main/config/build-distribution-archive.xml
+++ b/usage/dist/src/main/config/build-distribution-archive.xml
@@ -33,12 +33,16 @@
             <directoryMode>0755</directoryMode>
             <includes>
                 <include>README*</include>
-                <include>LICENSE*</include>
-                <include>NOTICE*</include>
                 <include>DISCLAIMER*</include>
             </includes>
         </fileSet>
         <fileSet>
+            <directory>${project.basedir}/src/main/license</directory>
+            <outputDirectory>/</outputDirectory>
+            <fileMode>0644</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+        <fileSet>
             <directory>${project.basedir}/src/main/dist/bin</directory>
             <outputDirectory>/bin</outputDirectory>
             <fileMode>0755</fileMode>
@@ -79,6 +83,7 @@
             <outputDirectory>/lib/brooklyn</outputDirectory>
             <fileMode>0644</fileMode>
             <directoryMode>0755</directoryMode>
+            <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
         </dependencySet>
     </dependencySets>
 </assembly>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f5bf31f5/usage/dist/src/main/config/build-distribution-dir.xml
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/config/build-distribution-dir.xml b/usage/dist/src/main/config/build-distribution-dir.xml
index 72b4989..a7a8b56 100644
--- a/usage/dist/src/main/config/build-distribution-dir.xml
+++ b/usage/dist/src/main/config/build-distribution-dir.xml
@@ -33,12 +33,16 @@
             <directoryMode>0755</directoryMode>
             <includes>
                 <include>README*</include>
-                <include>LICENSE*</include>
-                <include>NOTICE*</include>
                 <include>DISCLAIMER*</include>
             </includes>
         </fileSet>
         <fileSet>
+            <directory>${project.basedir}/src/main/license</directory>
+            <outputDirectory>/</outputDirectory>
+            <fileMode>0644</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+        <fileSet>
             <directory>${project.basedir}/src/main/dist/bin</directory>
             <outputDirectory>/bin</outputDirectory>
             <fileMode>0755</fileMode>
@@ -79,6 +83,7 @@
             <outputDirectory>/lib/brooklyn</outputDirectory>
             <fileMode>0644</fileMode>
             <directoryMode>0755</directoryMode>
+            <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
         </dependencySet>
     </dependencySets>
 </assembly>


[11/19] incubator-brooklyn git commit: Add DISCLAIMER file to Maven artifacts

Posted by he...@apache.org.
Add DISCLAIMER file to Maven artifacts

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

Branch: refs/heads/master
Commit: aab6a7642a6143546bec7bceeaf6c99faddaf3bc
Parents: f5bf31f
Author: Richard Downer <ri...@apache.org>
Authored: Fri Apr 17 16:01:59 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Apr 17 16:26:11 2015 +0100

----------------------------------------------------------------------
 pom.xml                                         | 20 ++++++++++++++++++++
 usage/cli/src/main/license/DISCLAIMER           |  8 ++++++++
 usage/cli/src/test/license/DISCLAIMER           |  8 ++++++++
 usage/dist/src/main/license/DISCLAIMER          |  8 ++++++++
 usage/jsgui/src/main/license/DISCLAIMER         |  8 ++++++++
 usage/jsgui/src/test/license/DISCLAIMER         |  8 ++++++++
 utils/jmx/jmxmp-ssl-agent/pom.xml               |  5 +++++
 .../src/main/license/DISCLAIMER.shaded          |  8 ++++++++
 8 files changed, 73 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aab6a764/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7de32ec..962bc30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1231,6 +1231,26 @@
                 </excludes>
               </configuration>
             </plugin>
+
+            <!-- Add off-the-schelf LICENSE, NOTICE and DISCLAIMER to each jar. Where off-the-shelf isn't suitable
+               - for submodules, they can disable this processing and intergrate their own files. -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+                                <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <extensions>
             <extension>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aab6a764/usage/cli/src/main/license/DISCLAIMER
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/DISCLAIMER b/usage/cli/src/main/license/DISCLAIMER
new file mode 100644
index 0000000..9e6119b
--- /dev/null
+++ b/usage/cli/src/main/license/DISCLAIMER
@@ -0,0 +1,8 @@
+
+Apache Brooklyn is an effort undergoing incubation at The Apache Software Foundation (ASF), 
+sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until 
+a further review indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. While incubation 
+status is not necessarily a reflection of the completeness or stability of the code, it does 
+indicate that the project has yet to be fully endorsed by the ASF.
+

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aab6a764/usage/cli/src/test/license/DISCLAIMER
----------------------------------------------------------------------
diff --git a/usage/cli/src/test/license/DISCLAIMER b/usage/cli/src/test/license/DISCLAIMER
new file mode 100644
index 0000000..9e6119b
--- /dev/null
+++ b/usage/cli/src/test/license/DISCLAIMER
@@ -0,0 +1,8 @@
+
+Apache Brooklyn is an effort undergoing incubation at The Apache Software Foundation (ASF), 
+sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until 
+a further review indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. While incubation 
+status is not necessarily a reflection of the completeness or stability of the code, it does 
+indicate that the project has yet to be fully endorsed by the ASF.
+

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aab6a764/usage/dist/src/main/license/DISCLAIMER
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/license/DISCLAIMER b/usage/dist/src/main/license/DISCLAIMER
new file mode 100644
index 0000000..9e6119b
--- /dev/null
+++ b/usage/dist/src/main/license/DISCLAIMER
@@ -0,0 +1,8 @@
+
+Apache Brooklyn is an effort undergoing incubation at The Apache Software Foundation (ASF), 
+sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until 
+a further review indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. While incubation 
+status is not necessarily a reflection of the completeness or stability of the code, it does 
+indicate that the project has yet to be fully endorsed by the ASF.
+

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aab6a764/usage/jsgui/src/main/license/DISCLAIMER
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/license/DISCLAIMER b/usage/jsgui/src/main/license/DISCLAIMER
new file mode 100644
index 0000000..9e6119b
--- /dev/null
+++ b/usage/jsgui/src/main/license/DISCLAIMER
@@ -0,0 +1,8 @@
+
+Apache Brooklyn is an effort undergoing incubation at The Apache Software Foundation (ASF), 
+sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until 
+a further review indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. While incubation 
+status is not necessarily a reflection of the completeness or stability of the code, it does 
+indicate that the project has yet to be fully endorsed by the ASF.
+

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aab6a764/usage/jsgui/src/test/license/DISCLAIMER
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/license/DISCLAIMER b/usage/jsgui/src/test/license/DISCLAIMER
new file mode 100644
index 0000000..9e6119b
--- /dev/null
+++ b/usage/jsgui/src/test/license/DISCLAIMER
@@ -0,0 +1,8 @@
+
+Apache Brooklyn is an effort undergoing incubation at The Apache Software Foundation (ASF), 
+sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until 
+a further review indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. While incubation 
+status is not necessarily a reflection of the completeness or stability of the code, it does 
+indicate that the project has yet to be fully endorsed by the ASF.
+

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aab6a764/utils/jmx/jmxmp-ssl-agent/pom.xml
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml
index aad0abe..d48ddd9 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -78,6 +78,7 @@
                                 <resources>
                                     <resource>META-INF/LICENSE</resource>
                                     <resource>META-INF/NOTICE</resource>
+                                    <resource>META-INF/DISCLAIMER</resource>
                                 </resources>
                             </transformer>
                             <!-- Replace it with license/notice for the shaded artifact -->
@@ -89,6 +90,10 @@
                                 <resource>META-INF/NOTICE</resource>
                                 <file>src/main/license/NOTICE.shaded</file>
                             </transformer>
+                            <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                                <resource>META-INF/DISCLAIMER</resource>
+                                <file>src/main/license/DISCLAIMER.shaded</file>
+                            </transformer>
                         </transformers>
                     </configuration>
                 </plugin>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aab6a764/utils/jmx/jmxmp-ssl-agent/src/main/license/DISCLAIMER.shaded
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/src/main/license/DISCLAIMER.shaded b/utils/jmx/jmxmp-ssl-agent/src/main/license/DISCLAIMER.shaded
new file mode 100644
index 0000000..9e6119b
--- /dev/null
+++ b/utils/jmx/jmxmp-ssl-agent/src/main/license/DISCLAIMER.shaded
@@ -0,0 +1,8 @@
+
+Apache Brooklyn is an effort undergoing incubation at The Apache Software Foundation (ASF), 
+sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until 
+a further review indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. While incubation 
+status is not necessarily a reflection of the completeness or stability of the code, it does 
+indicate that the project has yet to be fully endorsed by the ASF.
+


[12/19] incubator-brooklyn git commit: Non-blocking jetty connector for https

Posted by he...@apache.org.
Non-blocking jetty connector for https


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

Branch: refs/heads/master
Commit: 74c421bf8c23866d5c96f233012507a0e49e8eaa
Parents: ff31a41
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Apr 21 11:37:06 2015 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Apr 21 11:37:06 2015 +0300

----------------------------------------------------------------------
 .../brooklyn/launcher/BrooklynWebServer.java    | 140 ++++++++++---------
 1 file changed, 72 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/74c421bf/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java b/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
index 56df07a..eaa1209 100644
--- a/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
+++ b/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
@@ -20,10 +20,10 @@ package brooklyn.launcher;
 
 import java.io.File;
 import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.URI;
 import java.security.KeyPair;
 import java.security.KeyStore;
+import java.security.KeyStoreException;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.text.SimpleDateFormat;
@@ -36,7 +36,8 @@ import javax.servlet.DispatcherType;
 
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -59,8 +60,8 @@ import brooklyn.management.internal.ManagementContextInternal;
 import brooklyn.rest.BrooklynRestApi;
 import brooklyn.rest.BrooklynWebConfig;
 import brooklyn.rest.filter.BrooklynPropertiesSecurityFilter;
-import brooklyn.rest.filter.HaMasterCheckFilter;
 import brooklyn.rest.filter.HaHotCheckResourceFilter;
+import brooklyn.rest.filter.HaMasterCheckFilter;
 import brooklyn.rest.filter.LoggingFilter;
 import brooklyn.rest.filter.NoCacheFilter;
 import brooklyn.rest.filter.RequestTaggingFilter;
@@ -360,7 +361,19 @@ public class BrooklynWebServer {
                 throw new IllegalStateException("Unable to provision port for web console (wanted "+portRange+")");
         }
 
-        server = new Server(new InetSocketAddress(bindAddress, actualPort));
+        server = new Server();
+        final Connector connector;
+        if (getHttpsEnabled()) {
+            connector = new SslSelectChannelConnector(createContextFactory());
+        } else {
+            connector = new SelectChannelConnector();
+        }
+        if (bindAddress != null) {
+            connector.setHost(bindAddress.getHostName());
+        }
+        connector.setPort(actualPort);
+        server.setConnectors(new Connector[]{connector});
+
         if (bindAddress == null || bindAddress.equals(InetAddress.getByAddress(new byte[] { 0, 0, 0, 0 }))) {
             actualAddress = BrooklynNetworkUtils.getLocalhostInetAddress();
         } else {
@@ -375,70 +388,6 @@ public class BrooklynWebServer {
         if (log.isDebugEnabled())
             log.debug("Starting Brooklyn console at "+getRootUrl()+", running " + war + (wars != null ? " and " + wars.values() : ""));
         
-        if (getHttpsEnabled()) {
-            //by default the server is configured with a http connector, this needs to be removed since we are going
-            //to provide https
-            for (Connector c: server.getConnectors()) {
-                server.removeConnector(c);
-            }
-
-            SslContextFactory sslContextFactory = new SslContextFactory();
-
-            // allow webconsole keystore & related properties to be set in brooklyn.properties
-            if (Strings.isNonBlank(keystorePath)) {
-                if (keystoreUrl==null) {
-                    log.warn("Deprecated 'keystorePath' used; callers should use 'keystoreUrl'");
-                    keystoreUrl = keystorePath;
-                } else if (!keystoreUrl.equals(keystorePath)) {
-                    log.warn("Deprecated 'keystorePath' supplied with different value than 'keystoreUrl', preferring the latter: "+
-                        keystorePath+" / "+keystoreUrl);
-                }
-            }
-            if (keystoreUrl==null) keystoreUrl = managementContext.getConfig().getConfig(BrooklynWebConfig.KEYSTORE_URL);
-            if (keystorePassword==null) keystorePassword = managementContext.getConfig().getConfig(BrooklynWebConfig.KEYSTORE_PASSWORD);
-            if (keystoreCertAlias==null) keystoreCertAlias = managementContext.getConfig().getConfig(BrooklynWebConfig.KEYSTORE_CERTIFICATE_ALIAS);
-            
-            if (keystoreUrl!=null) {
-                sslContextFactory.setKeyStorePath(ResourceUtils.create(this).checkUrlExists(keystoreUrl, BrooklynWebConfig.KEYSTORE_URL.getName()));
-                if (Strings.isEmpty(keystorePassword))
-                    throw new IllegalArgumentException("Keystore password is required and non-empty if keystore is specified.");
-                sslContextFactory.setKeyStorePassword(keystorePassword);
-                if (Strings.isNonEmpty(keystoreCertAlias))
-                    sslContextFactory.setCertAlias(keystoreCertAlias);
-            } else {
-                log.info("No keystore specified but https enabled; creating a default keystore");
-                
-                if (Strings.isEmpty(keystoreCertAlias))
-                    keystoreCertAlias = "web-console";
-                
-                // if password is blank the process will block and read from stdin !
-                if (Strings.isEmpty(keystorePassword)) {
-                    keystorePassword = Identifiers.makeRandomId(8);
-                    log.debug("created random password "+keystorePassword+" for ad hoc internal keystore");
-                }
-                
-                KeyStore ks = SecureKeys.newKeyStore();
-                KeyPair key = SecureKeys.newKeyPair();
-                X509Certificate cert = new FluentKeySigner("brooklyn").newCertificateFor("web-console", key);
-                ks.setKeyEntry(keystoreCertAlias, key.getPrivate(), keystorePassword.toCharArray(),
-                    new Certificate[] { cert });
-                
-                sslContextFactory.setKeyStore(ks);
-                sslContextFactory.setKeyStorePassword(keystorePassword);
-                sslContextFactory.setCertAlias(keystoreCertAlias);
-            }
-            if (!Strings.isEmpty(truststorePath)) {
-                sslContextFactory.setTrustStore(checkFileExists(truststorePath, "truststore"));
-                sslContextFactory.setTrustStorePassword(trustStorePassword);
-            }
-
-            sslContextFactory.addExcludeProtocols("SSLv3");
-
-            SslSocketConnector sslSocketConnector = new SslSocketConnector(sslContextFactory);
-            sslSocketConnector.setPort(actualPort);
-            server.addConnector(sslSocketConnector);
-        }
-
         addShutdownHook();
 
         MutableMap<String, String> allWars = MutableMap.copyOf(wars);
@@ -474,6 +423,61 @@ public class BrooklynWebServer {
         log.info("Started Brooklyn console at "+getRootUrl()+", running " + rootWar + (allWars!=null && !allWars.isEmpty() ? " and " + wars.values() : ""));
     }
 
+    private SslContextFactory createContextFactory() throws KeyStoreException {
+        SslContextFactory sslContextFactory = new SslContextFactory();
+
+        // allow webconsole keystore & related properties to be set in brooklyn.properties
+        if (Strings.isNonBlank(keystorePath)) {
+            if (keystoreUrl==null) {
+                log.warn("Deprecated 'keystorePath' used; callers should use 'keystoreUrl'");
+                keystoreUrl = keystorePath;
+            } else if (!keystoreUrl.equals(keystorePath)) {
+                log.warn("Deprecated 'keystorePath' supplied with different value than 'keystoreUrl', preferring the latter: "+
+                    keystorePath+" / "+keystoreUrl);
+            }
+        }
+        if (keystoreUrl==null) keystoreUrl = managementContext.getConfig().getConfig(BrooklynWebConfig.KEYSTORE_URL);
+        if (keystorePassword==null) keystorePassword = managementContext.getConfig().getConfig(BrooklynWebConfig.KEYSTORE_PASSWORD);
+        if (keystoreCertAlias==null) keystoreCertAlias = managementContext.getConfig().getConfig(BrooklynWebConfig.KEYSTORE_CERTIFICATE_ALIAS);
+        
+        if (keystoreUrl!=null) {
+            sslContextFactory.setKeyStorePath(ResourceUtils.create(this).checkUrlExists(keystoreUrl, BrooklynWebConfig.KEYSTORE_URL.getName()));
+            if (Strings.isEmpty(keystorePassword))
+                throw new IllegalArgumentException("Keystore password is required and non-empty if keystore is specified.");
+            sslContextFactory.setKeyStorePassword(keystorePassword);
+            if (Strings.isNonEmpty(keystoreCertAlias))
+                sslContextFactory.setCertAlias(keystoreCertAlias);
+        } else {
+            log.info("No keystore specified but https enabled; creating a default keystore");
+            
+            if (Strings.isEmpty(keystoreCertAlias))
+                keystoreCertAlias = "web-console";
+            
+            // if password is blank the process will block and read from stdin !
+            if (Strings.isEmpty(keystorePassword)) {
+                keystorePassword = Identifiers.makeRandomId(8);
+                log.debug("created random password "+keystorePassword+" for ad hoc internal keystore");
+            }
+            
+            KeyStore ks = SecureKeys.newKeyStore();
+            KeyPair key = SecureKeys.newKeyPair();
+            X509Certificate cert = new FluentKeySigner("brooklyn").newCertificateFor("web-console", key);
+            ks.setKeyEntry(keystoreCertAlias, key.getPrivate(), keystorePassword.toCharArray(),
+                new Certificate[] { cert });
+            
+            sslContextFactory.setKeyStore(ks);
+            sslContextFactory.setKeyStorePassword(keystorePassword);
+            sslContextFactory.setCertAlias(keystoreCertAlias);
+        }
+        if (!Strings.isEmpty(truststorePath)) {
+            sslContextFactory.setTrustStore(checkFileExists(truststorePath, "truststore"));
+            sslContextFactory.setTrustStorePassword(trustStorePassword);
+        }
+
+        sslContextFactory.addExcludeProtocols("SSLv3");
+        return sslContextFactory;
+    }
+
     private String newTimestampedDirName(String prefix, int randomSuffixLength) {
         return prefix + "-" + new SimpleDateFormat("yyyyMMdd-HHmmss").format(new Date()) + "-" + Identifiers.makeRandomId(randomSuffixLength);
     }


[17/19] incubator-brooklyn git commit: This closes #603

Posted by he...@apache.org.
This closes #603


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

Branch: refs/heads/master
Commit: b52184e467759c97bdb9e5264dcefc8ffe0638b6
Parents: df27a39 3cb4f55
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Apr 21 21:46:23 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Apr 21 21:46:23 2015 +0100

----------------------------------------------------------------------
 .../entity/webapp/ControlledDynamicWebAppClusterImpl.java | 10 +++++-----
 .../ControlledDynamicWebAppClusterIntegrationTest.java    |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------



[16/19] incubator-brooklyn git commit: This closes #606

Posted by he...@apache.org.
This closes #606


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

Branch: refs/heads/master
Commit: df27a39042d27b3b0263e02c68195d76a57abac2
Parents: c704e9f bb24410
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Apr 21 21:46:01 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Apr 21 21:46:01 2015 +0100

----------------------------------------------------------------------
 .../java/brooklyn/entity/nosql/riak/RiakNode.java   |  5 ++++-
 .../entity/nosql/riak/RiakNodeSshDriver.java        | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------



[14/19] incubator-brooklyn git commit: Added additional config content

Posted by he...@apache.org.
Added additional config content

- rename the parameter
- upload the config file at one step
- RiakNodeSshDriver - no need to use queueIfPossible


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

Branch: refs/heads/master
Commit: bb244102aa3fe28f5659ea31fe925642a1771660
Parents: 4a679f4
Author: Valentin Aitken <va...@cloudsoftcorp.com>
Authored: Tue Apr 21 18:23:07 2015 +0300
Committer: Valentin Aitken <va...@cloudsoftcorp.com>
Committed: Tue Apr 21 18:33:43 2015 +0300

----------------------------------------------------------------------
 .../java/brooklyn/entity/nosql/riak/RiakNode.java   |  3 +++
 .../entity/nosql/riak/RiakNodeSshDriver.java        | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bb244102/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java
index 67f590f..0312890 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java
@@ -70,6 +70,9 @@ public interface RiakNode extends SoftwareProcess {
             "riak.riakConf.templateUrl.mac", "Template file (in freemarker format) for the app.config config file",
             "classpath://brooklyn/entity/nosql/riak/riak-mac.conf");
 
+    ConfigKey<String> RIAK_CONF_ADDITIONAL_CONTENT = ConfigKeys.newStringConfigKey(
+            "riak.riakConf.additionalContent", "Template file (in freemarker format) for setting up additional settings in the riak.conf file", "");
+
     @SetFromFlag("downloadUrlRhelCentos")
     AttributeSensorAndConfigKey<String, String> DOWNLOAD_URL_RHEL_CENTOS = ConfigKeys.newTemplateSensorAndConfigKey("download.url.rhelcentos",
             "URL pattern for downloading the linux RPM installer (will substitute things like ${version} automatically)",

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bb244102/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
index 33a63ca..5bd7867 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
@@ -56,7 +56,6 @@ import brooklyn.util.text.Strings;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -237,19 +236,26 @@ public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implemen
         if (isVersion1()) {
             String vmArgsTemplate = processTemplate(entity.getConfig(RiakNode.RIAK_VM_ARGS_TEMPLATE_URL));
             String saveAsVmArgs = Urls.mergePaths(getRunDir(), "vm.args");
-            DynamicTasks.queueIfPossible(SshEffectorTasks.put(saveAsVmArgs).contents(vmArgsTemplate));
+            DynamicTasks.queue(SshEffectorTasks.put(saveAsVmArgs).contents(vmArgsTemplate));
             commands.add(sudo("mv " + saveAsVmArgs + " " + getRiakEtcDir()));
 
             String appConfigTemplate = processTemplate(entity.getConfig(RiakNode.RIAK_APP_CONFIG_TEMPLATE_URL));
             String saveAsAppConfig = Urls.mergePaths(getRunDir(), "app.config");
-            DynamicTasks.queueIfPossible(SshEffectorTasks.put(saveAsAppConfig).contents(appConfigTemplate));
+            DynamicTasks.queue(SshEffectorTasks.put(saveAsAppConfig).contents(appConfigTemplate));
             commands.add(sudo("mv " + saveAsAppConfig + " " + getRiakEtcDir()));
         } else {
             String templateUrl = osDetails.isMac() ? entity.getConfig(RiakNode.RIAK_CONF_TEMPLATE_URL_MAC) :
                     entity.getConfig(RiakNode.RIAK_CONF_TEMPLATE_URL_LINUX);
-            String riakConfTemplate = processTemplate(templateUrl);
+            String riakConfContent = processTemplate(templateUrl);
             String saveAsRiakConf = Urls.mergePaths(getRunDir(), "riak.conf");
-            DynamicTasks.queueIfPossible(SshEffectorTasks.put(saveAsRiakConf).contents(riakConfTemplate));
+
+            if(Strings.isNonBlank(entity.getConfig(RiakNode.RIAK_CONF_ADDITIONAL_CONTENT))) {
+                String additionalConfigContent = processTemplateContents(entity.getConfig(RiakNode.RIAK_CONF_ADDITIONAL_CONTENT));
+                riakConfContent += "\n## Brooklyn note: additional config\n";
+                riakConfContent += additionalConfigContent;
+            }
+
+            DynamicTasks.queue(SshEffectorTasks.put(saveAsRiakConf).contents(riakConfContent));
             commands.add(sudo("mv " + saveAsRiakConf + " " + getRiakEtcDir()));
         }
 


[06/19] incubator-brooklyn git commit: Remove brooklyn-all-*-with-dependencies.jar

Posted by he...@apache.org.
Remove brooklyn-all-*-with-dependencies.jar

See discussion:
https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201504.mbox/%3CCABQFKi0_pYS%2BLxZFjapKwyZ0Ug1Hg03nhX-yo1mAryBjroR4Nw%40mail.gmail.com%3E


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

Branch: refs/heads/master
Commit: 6de3d74abeb3785a3ff4f7da71e458adbaf492c0
Parents: d02ab99
Author: Richard Downer <ri...@apache.org>
Authored: Fri Apr 17 09:44:58 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Apr 17 09:44:58 2015 +0100

----------------------------------------------------------------------
 usage/all/pom.xml           | 46 +---------------------------------------
 usage/all/start-mgmt-web.sh | 43 -------------------------------------
 2 files changed, 1 insertion(+), 88 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6de3d74a/usage/all/pom.xml
----------------------------------------------------------------------
diff --git a/usage/all/pom.xml b/usage/all/pom.xml
index 846c803..bc0dd00 100644
--- a/usage/all/pom.xml
+++ b/usage/all/pom.xml
@@ -25,8 +25,7 @@
 
     <name>Brooklyn All Things</name>
     <description>
-        All Brooklyn entities and policies including web-console and CLI launcher
-        packaged as a single Jar with dependencies for easy usage
+        A meta-dependency for all the major Brooklyn modules.
     </description>
 
     <parent>
@@ -109,47 +108,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <activation>
-                <property>
-                    <name>!skipShade</name>
-                </property>
-            </activation>
-            <id>shade</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-shade-plugin</artifactId>
-                        <configuration>
-                            <outputFile>${project.build.directory}/${project.artifactId}-${project.version}-with-dependencies.jar</outputFile>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-distribution</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/${project.artifactId}-${project.version}-with-dependencies.jar</file>
-                                            <type>jar</type>
-                                            <classifier>with-dependencies</classifier>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6de3d74a/usage/all/start-mgmt-web.sh
----------------------------------------------------------------------
diff --git a/usage/all/start-mgmt-web.sh b/usage/all/start-mgmt-web.sh
deleted file mode 100755
index 53505d9..0000000
--- a/usage/all/start-mgmt-web.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-#
-# Brooklyn Management
-#
-# Run this, then you should see the Brooklyn mgmt webapp at localhost:8081/
-#
-#set -x # debug
-
-CLASS=brooklyn.launcher.Main
-
-ROOT=$(cd $(dirname $0) && pwd)
-cd $ROOT
-
-JAVA_OPTS="-Xms256m -Xmx1g -XX:MaxPermSize=256m"
-export CP=`ls ./target/brooklyn-all-*-with-dependencies.jar | awk '{print $1}'`
-
-if [ -z "$CP" ]; then
-	echo "Cannot find the with-dependencies jar"
-	exit 1
-fi
-
-echo running Brooklyn Web Console using $CLASS from $CP at $LOCATIONS
-
-echo java $JAVA_OPTS -cp "$CP" $CLASS $LOCATIONS
-java $JAVA_OPTS -cp "$CP" $CLASS $LOCATIONS


[02/19] incubator-brooklyn git commit: Different LICENSE/NOTICE for usage/jsgui

Posted by he...@apache.org.
Different LICENSE/NOTICE for usage/jsgui


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

Branch: refs/heads/master
Commit: d25806d398f93d3a10114e868cb0980de643f80a
Parents: 430fb33
Author: Richard Downer <ri...@apache.org>
Authored: Thu Apr 16 14:24:41 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Apr 16 16:01:01 2015 +0100

----------------------------------------------------------------------
 usage/jsgui/pom.xml                  |  33 ++++
 usage/jsgui/src/main/license/LICENSE | 292 ++++++++++++++++++++++++++++++
 usage/jsgui/src/main/license/NOTICE  |   5 +
 usage/jsgui/src/main/webapp/LICENSE  | 176 ------------------
 usage/jsgui/src/test/license/LICENSE | 175 ++++++++++++++++++
 usage/jsgui/src/test/license/NOTICE  |   5 +
 6 files changed, 510 insertions(+), 176 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d25806d3/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index 20e760e..9ffdef0 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -146,6 +146,16 @@
                 <targetPath>${project.build.directory}/jasmine/fixtures</targetPath>
             </resource>
         </resources>
+        <!-- Insert special LICENSE/NOTICE into the <test-jar>/META-INF folder -->
+        <testResources>
+            <testResource>
+                <directory>${project.basedir}/src/test/resources</directory>
+            </testResource>
+            <testResource>
+                <targetPath>META-INF</targetPath>
+                <directory>${basedir}/src/test/license</directory>
+            </testResource>
+        </testResources>
         <plugins>
             <!--
                  run js tests with: $ mvn clean process-resources jasmine:test
@@ -220,8 +230,31 @@
                 <version>${maven-war-plugin.version}</version>
                 <configuration>
                     <useCache>true</useCache> <!-- to prevent replaced files being overwritten -->
+                    <!-- Insert special LICENSE/NOTICE into the <war>/META-INF folder -->
+                    <webResources>
+                        <webResource>
+                            <targetPath>META-INF</targetPath>
+                            <directory>${basedir}/src/main/license</directory>
+                        </webResource>
+                    </webResources>
                 </configuration>
             </plugin>
+            <!-- Disable the automatic LICENSE/NOTICE placement from the upstream pom, because we need to include
+                 bundled dependencies. See "webResources" section above for where we include the new LICENSE/NOTICE -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
 
         <pluginManagement>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d25806d3/usage/jsgui/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/license/LICENSE b/usage/jsgui/src/main/license/LICENSE
new file mode 100644
index 0000000..d9f5bc7
--- /dev/null
+++ b/usage/jsgui/src/main/license/LICENSE
@@ -0,0 +1,292 @@
+
+                                 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.
+
+
+
+---------------------------------------------------
+
+This distribution contains third party resources.
+
+This product includes software developed at The jQuery Foundation (http://jquery.org/):
+jquery.js, selected jquery*.js.
+Copyright (c) John Resig (2011).
+Licensed under the MIT license (see below).
+
+This product includes software developed at The Dojo Foundation (http://dojofoundation.org/):
+require.js, text.js, sizzle.js in jquery.js.
+Copyright (c) The Dojo Foundation (2011, 2012).
+Licensed under the MIT license (see below).
+
+This product includes software developed at DocumentCloud Inc (http://www.documentcloud.org/):
+backbone.js, underscore.js.
+Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013).
+Licensed under the MIT license (see below).
+
+This product includes software developed by Miller Medeiros (https://github.com/millermedeiros/):
+async.js.
+Copyright (c) Miller Medeiros (2011).
+Licensed under the MIT license (see below).
+
+This product includes software developed by Yehuda Katz (https://github.com/wycats/):
+handlebars*.js.
+Copyright (c) Yehuda Katz (2012).
+Licensed under the MIT license (see below).
+
+This product includes software developed by "Cowboy" Ben Alman (http://benalman.com/).
+jquery.ba-bbq*.js
+Copyright (c) "Cowboy" Ben Alman (2010).
+Licensed under the MIT license (see below).
+
+This product includes software developed by WonderGroup and Jordan Thomas (http://labs.wondergroup.com/demos/mini-ui/index.html):
+jquery.wiggle.js.
+Copyright (c) WonderGroup and Jordan Thomas (2010).
+Licensed under the MIT license (see below).
+
+This product includes software developed by Tim Wood (http://momentjs.com):
+moment.js
+Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014).
+Licensed under the MIT license (see below).
+
+This product includes software developed by ZeroClipboard contributors (https://github.com/zeroclipboard):
+ZeroClipboard.js
+Copyright (c) Jon Rohan, James M. Greene (2014).
+Licensed under the MIT license (see below).
+
+This product includes software developed at SpryMedia Ltd (http://sprymedia.co.uk/):
+jquery.dataTables.js, dataTables.extensions.js
+Copyright (c) Allan Jardine (2008-2012).
+Licensed under the New BSD license (see below).
+
+This product includes software developed by js-uri contributors (https://code.google.com/js-uri):
+URI.js.
+Copyright (c) js-uri contributors (2013).
+Licensed under the New BSD license (see below).
+
+This product includes software developed by Vitaly Puzrin (https://github.com/nodeca/):
+js-yaml.js
+Copyright (c) Vitaly Puzrin (2011-2015).
+Licensed under the MIT license (see below).
+
+
+
+The MIT License ("MIT")
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+
+The BSD 3-Clause License ("New BSD")
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+this list of conditions and the following disclaimer.
+
+2. 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.
+
+3. Neither the name of the copyright holder nor the names of its contributors 
+may 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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d25806d3/usage/jsgui/src/main/license/NOTICE
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/license/NOTICE b/usage/jsgui/src/main/license/NOTICE
new file mode 100644
index 0000000..f790f13
--- /dev/null
+++ b/usage/jsgui/src/main/license/NOTICE
@@ -0,0 +1,5 @@
+Apache Brooklyn
+Copyright 2014-2015 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-brooklyn/blob/d25806d3/usage/jsgui/src/main/webapp/LICENSE
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/LICENSE b/usage/jsgui/src/main/webapp/LICENSE
deleted file mode 100644
index e885a7b..0000000
--- a/usage/jsgui/src/main/webapp/LICENSE
+++ /dev/null
@@ -1,176 +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.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d25806d3/usage/jsgui/src/test/license/LICENSE
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/license/LICENSE b/usage/jsgui/src/test/license/LICENSE
new file mode 100644
index 0000000..67db858
--- /dev/null
+++ b/usage/jsgui/src/test/license/LICENSE
@@ -0,0 +1,175 @@
+
+                                 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.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d25806d3/usage/jsgui/src/test/license/NOTICE
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/license/NOTICE b/usage/jsgui/src/test/license/NOTICE
new file mode 100644
index 0000000..f790f13
--- /dev/null
+++ b/usage/jsgui/src/test/license/NOTICE
@@ -0,0 +1,5 @@
+Apache Brooklyn
+Copyright 2014-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).


[03/19] incubator-brooklyn git commit: Different LICENSE/NOTICE for usage/cli

Posted by he...@apache.org.
Different LICENSE/NOTICE for usage/cli


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

Branch: refs/heads/master
Commit: 430fb338fa7a32f3df72d325e6d548b71f6b7d9a
Parents: 5ae0d4e
Author: Richard Downer <ri...@apache.org>
Authored: Thu Apr 16 12:02:15 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Apr 16 16:01:01 2015 +0100

----------------------------------------------------------------------
 usage/cli/pom.xml                  |  40 +++++-
 usage/cli/src/main/license/LICENSE | 208 ++++++++++++++++++++++++++++++++
 usage/cli/src/main/license/NOTICE  |   5 +
 usage/cli/src/test/license/LICENSE | 175 +++++++++++++++++++++++++++
 usage/cli/src/test/license/NOTICE  |   5 +
 5 files changed, 432 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/430fb338/usage/cli/pom.xml
----------------------------------------------------------------------
diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml
index a748a1d..1042649 100644
--- a/usage/cli/pom.xml
+++ b/usage/cli/pom.xml
@@ -133,6 +133,23 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <!-- Disable the automatic LICENSE/NOTICE placement from the upstream pom, because we need to include
+                 bloodhound.js. See "resources" section below for where we include the new LICENSE/NOTICE -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -152,5 +169,26 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-	</build>
+
+        <!-- Install our own LICENSE/NOTICE -->
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </resource>
+            <resource>
+                <targetPath>META-INF</targetPath>
+                <directory>${basedir}/src/main/license</directory>
+            </resource>
+        </resources>
+        <testResources>
+            <testResource>
+                <directory>${project.basedir}/src/test/resources</directory>
+            </testResource>
+            <testResource>
+                <targetPath>META-INF</targetPath>
+                <directory>${basedir}/src/test/license</directory>
+            </testResource>
+        </testResources>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/430fb338/usage/cli/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/LICENSE b/usage/cli/src/main/license/LICENSE
new file mode 100644
index 0000000..eb16d03
--- /dev/null
+++ b/usage/cli/src/main/license/LICENSE
@@ -0,0 +1,208 @@
+
+                                 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.
+
+
+
+---------------------------------------------------
+
+This distribution contains third party resources.
+
+This product includes software developed at Twitter, Inc (http://twitter.com):
+typeahead.js, bloodhound.js
+Copyright (c) Twitter, Inc (2013).
+Licensed under the MIT license (see below).
+
+
+
+The MIT License ("MIT")
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/430fb338/usage/cli/src/main/license/NOTICE
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/NOTICE b/usage/cli/src/main/license/NOTICE
new file mode 100644
index 0000000..f790f13
--- /dev/null
+++ b/usage/cli/src/main/license/NOTICE
@@ -0,0 +1,5 @@
+Apache Brooklyn
+Copyright 2014-2015 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-brooklyn/blob/430fb338/usage/cli/src/test/license/LICENSE
----------------------------------------------------------------------
diff --git a/usage/cli/src/test/license/LICENSE b/usage/cli/src/test/license/LICENSE
new file mode 100644
index 0000000..67db858
--- /dev/null
+++ b/usage/cli/src/test/license/LICENSE
@@ -0,0 +1,175 @@
+
+                                 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.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/430fb338/usage/cli/src/test/license/NOTICE
----------------------------------------------------------------------
diff --git a/usage/cli/src/test/license/NOTICE b/usage/cli/src/test/license/NOTICE
new file mode 100644
index 0000000..f790f13
--- /dev/null
+++ b/usage/cli/src/test/license/NOTICE
@@ -0,0 +1,5 @@
+Apache Brooklyn
+Copyright 2014-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).


[13/19] incubator-brooklyn git commit: Bump up default Riak version

Posted by he...@apache.org.
Bump up default Riak version


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

Branch: refs/heads/master
Commit: 4a679f4fdd39af69182f3e98e14a2cdde1338f60
Parents: ff31a41
Author: Valentin Aitken <va...@cloudsoftcorp.com>
Authored: Tue Apr 21 18:20:57 2015 +0300
Committer: Valentin Aitken <va...@cloudsoftcorp.com>
Committed: Tue Apr 21 18:20:57 2015 +0300

----------------------------------------------------------------------
 .../nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4a679f4f/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java
index 4625a8d..67f590f 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java
@@ -46,7 +46,7 @@ public interface RiakNode extends SoftwareProcess {
 
     @SetFromFlag("version")
     ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION,
-            "Version to install (Default 2.0.5)", "2.0.5");
+            "Version to install (Default 2.1.0)", "2.1.0");
 
     @SetFromFlag("optimizeNetworking")
     ConfigKey<Boolean> OPTIMIZE_HOST_NETWORKING  = ConfigKeys.newBooleanConfigKey("riak.networking.optimize", "Optimize host networking when running in a VM", Boolean.TRUE);


[19/19] incubator-brooklyn git commit: This closes #604

Posted by he...@apache.org.
This closes #604


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

Branch: refs/heads/master
Commit: 7b97cee1e70966860e2cbe82df0ccf56a0615774
Parents: 4f7778b 67aa0fd
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Apr 21 21:50:01 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Apr 21 21:50:01 2015 +0100

----------------------------------------------------------------------
 .../webapp/ControlledDynamicWebAppClusterImpl.java      |  1 +
 .../ControlledDynamicWebAppClusterIntegrationTest.java  | 12 ++++++++++++
 2 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7b97cee1/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7b97cee1/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
----------------------------------------------------------------------


[15/19] incubator-brooklyn git commit: This closes #607

Posted by he...@apache.org.
This closes #607


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

Branch: refs/heads/master
Commit: c704e9f4e62bdb37fd76f8e646f6674959d8a412
Parents: c4ca5b6 74c421b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Apr 21 21:45:10 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Apr 21 21:45:10 2015 +0100

----------------------------------------------------------------------
 .../brooklyn/launcher/BrooklynWebServer.java    | 140 ++++++++++---------
 1 file changed, 72 insertions(+), 68 deletions(-)
----------------------------------------------------------------------



[05/19] incubator-brooklyn git commit: Switch to Tomcat for ControlledDynamicWebAppCluster

Posted by he...@apache.org.
Switch to Tomcat for ControlledDynamicWebAppCluster

- Was previously a cluster of AS7 nodes; now Tomcat
- The reasons are:
  - Tomcat is a popular Apache project; Brooklyn is also in Apache
  - AS7 doesn’t support Java 8

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

Branch: refs/heads/master
Commit: 3cb4f556a86e9769fe8cf5f84bfab09f5395adf9
Parents: 4338a8f
Author: Aled Sage <al...@gmail.com>
Authored: Fri Apr 17 00:04:29 2015 -0500
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Apr 17 00:04:29 2015 -0500

----------------------------------------------------------------------
 .../entity/webapp/ControlledDynamicWebAppClusterImpl.java | 10 +++++-----
 .../ControlledDynamicWebAppClusterIntegrationTest.java    |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3cb4f556/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java b/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java
index 1c8b188..81b811e 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java
@@ -33,20 +33,20 @@ import brooklyn.entity.basic.DynamicGroupImpl;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.EntityPredicates;
 import brooklyn.entity.basic.Lifecycle;
-import brooklyn.entity.basic.QuorumCheck.QuorumChecks;
 import brooklyn.entity.basic.ServiceStateLogic;
 import brooklyn.entity.proxy.LoadBalancer;
 import brooklyn.entity.proxy.nginx.NginxController;
 import brooklyn.entity.proxying.EntitySpec;
 import brooklyn.entity.trait.Startable;
 import brooklyn.entity.trait.StartableMethods;
-import brooklyn.entity.webapp.jboss.JBoss7Server;
+import brooklyn.entity.webapp.tomcat.TomcatServer;
 import brooklyn.event.SensorEvent;
 import brooklyn.event.SensorEventListener;
 import brooklyn.event.feed.ConfigToAttributes;
 import brooklyn.location.Location;
 import brooklyn.util.collections.MutableList;
 import brooklyn.util.collections.MutableMap;
+import brooklyn.util.collections.QuorumCheck.QuorumChecks;
 import brooklyn.util.exceptions.Exceptions;
 
 import com.google.common.collect.ImmutableMap;
@@ -87,7 +87,7 @@ public class ControlledDynamicWebAppClusterImpl extends DynamicGroupImpl impleme
         EntitySpec<? extends WebAppService> webServerSpec = getAttribute(MEMBER_SPEC);
         if (webServerFactory == null && webServerSpec == null) {
             log.debug("creating default web server spec for {}", this);
-            webServerSpec = EntitySpec.create(JBoss7Server.class);
+            webServerSpec = EntitySpec.create(TomcatServer.class);
             setAttribute(MEMBER_SPEC, webServerSpec);
         }
         
@@ -139,8 +139,8 @@ public class ControlledDynamicWebAppClusterImpl extends DynamicGroupImpl impleme
 
     @Override
     protected void initEnrichers() {
-        if (getConfigRaw(UP_QUORUM_CHECK, false).isAbsent()) {
-            setConfig(UP_QUORUM_CHECK, QuorumChecks.newInstance(2, 1.0, false));
+        if (config().getLocalRaw(UP_QUORUM_CHECK).isAbsent()) {
+            config().set(UP_QUORUM_CHECK, QuorumChecks.newInstance(2, 1.0, false));
         }
         super.initEnrichers();
         ServiceStateLogic.newEnricherFromChildrenUp().checkChildrenOnly().requireUpChildren(getConfig(UP_QUORUM_CHECK)).addTo(this);

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3cb4f556/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
index ad19b6b..eb583ae 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
@@ -39,7 +39,6 @@ import brooklyn.entity.proxy.LoadBalancer;
 import brooklyn.entity.proxy.nginx.NginxController;
 import brooklyn.entity.proxying.EntitySpec;
 import brooklyn.entity.webapp.ControlledDynamicWebAppClusterTest.RecordingSensorEventListener;
-import brooklyn.entity.webapp.jboss.JBoss7Server;
 import brooklyn.entity.webapp.tomcat.TomcatServer;
 import brooklyn.location.basic.LocalhostMachineProvisioningLocation;
 import brooklyn.test.Asserts;
@@ -78,7 +77,7 @@ public class ControlledDynamicWebAppClusterIntegrationTest extends BrooklynAppLi
     public void testConfiguresController() {
         ControlledDynamicWebAppCluster cluster = app.createAndManageChild(EntitySpec.create(ControlledDynamicWebAppCluster.class)
                 .configure("initialSize", 1)
-                .configure("memberSpec", EntitySpec.create(JBoss7Server.class).configure("war", getTestWar())));
+                .configure("memberSpec", EntitySpec.create(TomcatServer.class).configure("war", getTestWar())));
         app.start(locs);
 
         String url = cluster.getController().getAttribute(NginxController.ROOT_URL);
@@ -90,7 +89,7 @@ public class ControlledDynamicWebAppClusterIntegrationTest extends BrooklynAppLi
     public void testSetsToplevelHostnameFromController() {
         ControlledDynamicWebAppCluster cluster = app.createAndManageChild(EntitySpec.create(ControlledDynamicWebAppCluster.class)
                 .configure("initialSize", 1)
-                .configure("memberSpec", EntitySpec.create(JBoss7Server.class).configure("war", getTestWar())));
+                .configure("memberSpec", EntitySpec.create(TomcatServer.class).configure("war", getTestWar())));
         app.start(locs);
 
         String expectedHostname = cluster.getController().getAttribute(LoadBalancer.HOSTNAME);
@@ -109,8 +108,8 @@ public class ControlledDynamicWebAppClusterIntegrationTest extends BrooklynAppLi
     public void testCustomWebClusterSpecGetsMemberSpec() {
         ControlledDynamicWebAppCluster cluster = app.createAndManageChild(EntitySpec.create(ControlledDynamicWebAppCluster.class)
                 .configure("initialSize", 1)
-                .configure(ControlledDynamicWebAppCluster.MEMBER_SPEC, EntitySpec.create(JBoss7Server.class)
-                        .configure(JBoss7Server.ROOT_WAR, getTestWar()))
+                .configure(ControlledDynamicWebAppCluster.MEMBER_SPEC, EntitySpec.create(TomcatServer.class)
+                        .configure(TomcatServer.ROOT_WAR, getTestWar()))
                 .configure(ControlledDynamicWebAppCluster.WEB_CLUSTER_SPEC, EntitySpec.create(DynamicWebAppCluster.class)
                         .displayName("mydisplayname")));
         app.start(locs);


[08/19] incubator-brooklyn git commit: propogates http/https ports to ControlledDynamicWebAppCluster entity

Posted by he...@apache.org.
propogates http/https ports to ControlledDynamicWebAppCluster entity


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

Branch: refs/heads/master
Commit: 67aa0fddb2051e4497b61f5fef3f551747b24491
Parents: 4338a8f
Author: Robert Moss <ro...@gmail.com>
Authored: Fri Apr 17 11:45:11 2015 +0100
Committer: Robert Moss <ro...@gmail.com>
Committed: Fri Apr 17 11:45:11 2015 +0100

----------------------------------------------------------------------
 .../webapp/ControlledDynamicWebAppClusterImpl.java      |  1 +
 .../ControlledDynamicWebAppClusterIntegrationTest.java  | 12 ++++++++++++
 2 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/67aa0fdd/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java b/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java
index 1c8b188..0bdad44 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterImpl.java
@@ -130,6 +130,7 @@ public class ControlledDynamicWebAppClusterImpl extends DynamicGroupImpl impleme
                 log.debug("creating controller using custom spec for {}", this);
             }
             controller = addChild(controllerSpec);
+            addEnricher(Enrichers.builder().propagating(LoadBalancer.PROXY_HTTP_PORT, LoadBalancer.PROXY_HTTPS_PORT).from(controller).build());
             if (Entities.isManaged(this)) Entities.manage(controller);
             setAttribute(CONTROLLER, controller);
         }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/67aa0fdd/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
index ad19b6b..f6a0064 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.concurrent.Callable;
 
 import brooklyn.test.TestResourceUnavailableException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.BeforeMethod;
@@ -49,6 +50,7 @@ import brooklyn.test.entity.TestJavaWebAppEntity;
 import brooklyn.util.collections.CollectionFunctionals;
 import brooklyn.util.collections.MutableMap;
 
+import com.google.common.base.Predicates;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -73,7 +75,17 @@ public class ControlledDynamicWebAppClusterIntegrationTest extends BrooklynAppLi
         TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/hello-world.war");
         return "classpath://hello-world.war";
     }
+    
+    @Test(groups="Integration")
+    public void testPropogateHttpPorts() {
+        ControlledDynamicWebAppCluster cluster = app.createAndManageChild(EntitySpec.create(ControlledDynamicWebAppCluster.class)
+                .configure("initialSize", 1));
+        app.start(locs);
 
+        EntityTestUtils.assertAttributeEventuallyNonNull(cluster, LoadBalancer.PROXY_HTTP_PORT);
+        EntityTestUtils.assertAttributeEventuallyNonNull(cluster, LoadBalancer.PROXY_HTTPS_PORT);
+    }
+    
     @Test(groups="Integration")
     public void testConfiguresController() {
         ControlledDynamicWebAppCluster cluster = app.createAndManageChild(EntitySpec.create(ControlledDynamicWebAppCluster.class)


[04/19] incubator-brooklyn git commit: Different LICENSE/NOTICE for shaded jmxmp-ssl-agent

Posted by he...@apache.org.
Different LICENSE/NOTICE for shaded jmxmp-ssl-agent


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

Branch: refs/heads/master
Commit: d02ab99c4d2bc95e8c81cbca427d49d57cdd7dc1
Parents: d25806d
Author: Richard Downer <ri...@apache.org>
Authored: Thu Apr 16 18:14:55 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Apr 16 18:14:55 2015 +0100

----------------------------------------------------------------------
 pom.xml                                         |   2 +
 utils/jmx/jmxmp-ssl-agent/pom.xml               |  52 +-
 .../src/main/license/LICENSE.shaded             | 925 +++++++++++++++++++
 .../src/main/license/NOTICE.shaded              |  15 +
 4 files changed, 980 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d02ab99c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2ed431c..5b6d1fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1203,6 +1203,8 @@
                   <!-- files not requiring licence -->
                   <exclude>ignored/**</exclude>
                   <exclude>LICENSE.md</exclude>
+                  <exclude>**/src/main/license/**</exclude>
+                  <exclude>**/src/test/license/**</exclude>
                   <exclude>**/MANIFEST.MF</exclude>
                   <exclude>**/test-output/**</exclude>
                   <exclude>**/*.pem.pub</exclude>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d02ab99c/utils/jmx/jmxmp-ssl-agent/pom.xml
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml
index d327f70..bf1923f 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -39,18 +39,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.brooklyn</groupId>
-            <artifactId>brooklyn-utils-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.glassfish.external</groupId>
             <artifactId>opendmk_jmxremote_optional_jar</artifactId>
-<!-- this is no longer avail on maven central!?
-            <groupId>javax.management</groupId>
-            <artifactId>jmxremote_optional</artifactId>
-            <version>1.0.1_04</version>
--->
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-ext-jdk15on</artifactId>
         </dependency>
 
         <dependency>
@@ -70,13 +64,43 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-ext-jdk15on</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <configuration>
+                        <transformers>
+                            <!-- So we need to copy the transformers configuration out of the root pom, otherwise we
+                               - expose bugs in the plugin. That sucks. -->
+                            <!-- whirr, among others, uses services which need careful attention -->
+                            <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                            <!-- end copy from root pom -->
+
+                            <!-- Cut out the license/notice for the unshaded artifact -->
+                            <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                                <resources>
+                                    <resource>META-INF/LICENSE</resource>
+                                    <resource>META-INF/NOTICE</resource>
+                                </resources>
+                            </transformer>
+                            <!-- Replace it with license/notice for the shaded artifact -->
+                            <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                                <resource>META-INF/LICENSE</resource>
+                                <file>src/main/license/LICENSE.shaded</file>
+                            </transformer>
+                            <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                                <resource>META-INF/NOTICE</resource>
+                                <file>src/main/license/NOTICE.shaded</file>
+                            </transformer>
+                        </transformers>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d02ab99c/utils/jmx/jmxmp-ssl-agent/src/main/license/LICENSE.shaded
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/src/main/license/LICENSE.shaded b/utils/jmx/jmxmp-ssl-agent/src/main/license/LICENSE.shaded
new file mode 100644
index 0000000..7ae7809
--- /dev/null
+++ b/utils/jmx/jmxmp-ssl-agent/src/main/license/LICENSE.shaded
@@ -0,0 +1,925 @@
+
+                                 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.
+
+-----------------------------------------------------------------------------
+
+This package incorporates the binaries of bcprov-ext-jdk15on from The Legion
+of the Bouncy Castle.
+
+Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc.
+(http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+-----------------------------------------------------------------------------
+
+This package incorporates the binaries of Project OpenDMK, JMX(TM) Remote API
+RI, Optional Packages.
+Copyright © 2007 Sun Microsystems,  Inc.,  4150 Network Circle,   Santa Clara,
+California 95054, U.S.A. All rights reserved.
+
+Licence as follows:
+
+CDDL-GPLv2 Dual License license.txt file
+
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.0
+=============================================================
+
+1. Definitions.
+
+1.1. "Contributor" means each individual or entity that creates or
+     contributes to the creation of Modifications.
+
+1.2. "Contributor Version" means the combination of the Original
+     Software, prior Modifications used by a Contributor (if any),
+     and the Modifications made by that particular Contributor.
+
+1.3. "Covered Software" means (a) the Original Software, or (b)
+     Modifications, or (c) the combination of files containing Original
+     Software with files containing Modifications, in each case including
+     portions thereof.
+
+1.4. "Executable" means the Covered Software in any form other than
+      Source Code.
+
+1.5. "Initial Developer" means the individual or entity that first
+     makes Original Software available under this License.
+
+1.6. "Larger Work" means a work which combines Covered Software or
+     portions thereof with code not governed by the terms of this License.
+
+1.7. "License" means this document.
+
+1.8. "Licensable" means having the right to grant, to the maximum extent
+     possible, whether at the time of the initial grant or subsequently
+     acquired, any and all of the rights conveyed herein.
+
+1.9. "Modifications" means the Source Code and Executable form of any of
+     the following:
+
+  A. Any file that results from an addition to, deletion from or
+     modification of the contents of a file containing Original
+     Software or previous Modifications;
+  B. Any new file that contains any part of the Original Software
+     or previous Modification; or
+  C. Any new file that is contributed or otherwise made available
+     under the terms of this License.
+
+1.10. "Original Software" means the Source Code and Executable form of
+     computer software code that is originally released under this
+     License.
+
+1.11. "Patent Claims" means any patent claim(s), now owned or hereafter
+      acquired, including without limitation, method, process, and
+      apparatus claims, in any patent Licensable by grantor.
+
+1.12. "Source Code" means (a) the common form of computer software
+      code in which modifications are made and (b) associated
+      documentation included in or with such code.
+
+1.13. "You" (or "Your") means an individual or a legal entity
+      exercising rights under, and complying with all of the terms of,
+      this License. For legal entities, "You" includes any entity which
+      controls, is controlled by, or is under common control with You.
+      For purposes of this definition, "control" means (a) the power,
+      direct or indirect, to cause the direction or management of such
+      entity, whether by contract or otherwise, or (b) ownership of more
+      than fifty percent (50%) of the outstanding shares or beneficial
+      ownership of such entity.
+
+2. License Grants.
+
+2.1. The Initial Developer Grant.
+     Conditioned upon Your compliance with Section 3.1 below and subject to
+     third party intellectual property claims, the Initial Developer hereby
+     grants You a world-wide, royalty-free, non-exclusive license:
+
+  (a) under intellectual property rights (other than patent or trademark)
+      Licensable by Initial Developer, to use, reproduce, modify, display,
+      perform, sublicense and distribute the Original Software (or
+      portions thereof), with or without Modifications, and/or as part
+      of a Larger Work; and
+  (b) under Patent Claims infringed by the making, using or selling of
+      Original Software, to make, have made, use, practice, sell, and
+      offer for sale, and/or otherwise dispose of the Original Software
+      (or portions thereof).
+  (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+      the date Initial Developer first distributes or otherwise makes the
+      Original Software available to a third party under the terms of this
+      License.
+  (d) Notwithstanding Section 2.1(b) above, no patent license is granted:
+      (1) for code that You delete from the Original Software, or (2) for
+      infringements caused by: (i) the modification of the Original
+      Software, or (ii) the combination of the Original Software with
+      other software or devices.
+
+2.2. Contributor Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and subject to
+third party intellectual property claims, each Contributor hereby grants
+You a world-wide, royalty-free, non-exclusive license:
+
+  (a) under intellectual property rights (other than patent or trademark)
+      Licensable by Contributor to use, reproduce, modify, display,
+      perform, sublicense and distribute the Modifications created by
+      such Contributor (or portions thereof), either on an unmodified
+      basis, with other Modifications, as Covered Software and/or as
+      part of a Larger Work; and
+
+  (b) under Patent Claims infringed by the making, using, or selling
+      of Modifications made by that Contributor either alone and/or
+      in combination with its Contributor Version (or portions of such
+      combination), to make, use, sell, offer for sale, have made,
+      and/or otherwise dispose of: (1) Modifications made by that
+      Contributor (or portions thereof); and (2) the combination of
+      Modifications made by that Contributor with its Contributor
+      Version (or portions of such combination).
+
+  (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+      on the date Contributor first distributes or otherwise makes the
+      Modifications available to a third party.
+
+  (d) Notwithstanding Section 2.2(b) above, no patent license is
+      granted: (1) for any code that Contributor has deleted from the
+      Contributor Version; (2) for infringements caused by: (i) third
+      party modifications of Contributor Version, or (ii) the combination
+      of Modifications made by that Contributor with other software
+      (except as part of the Contributor Version) or other devices;
+      or (3) under Patent Claims infringed by Covered Software in the
+      absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+3.1. Availability of Source Code.
+
+Any Covered Software that You distribute or otherwise make available in
+Executable form must also be made available in Source Code form and that
+Source Code form must be distributed only under the terms of this License.
+You must include a copy of this License with every copy of the Source Code
+form of the Covered Software You distribute or otherwise make available.
+You must inform recipients of any such Covered Software in Executable form
+as to how they can obtain such Covered Software in Source Code form in a
+reasonable manner on or through a medium customarily used for software
+exchange.
+
+3.2. Modifications.
+
+The Modifications that You create or to which You contribute are governed
+by the terms of this License. You represent that You believe Your
+Modifications are Your original creation(s) and/or You have sufficient
+rights to grant the rights conveyed by this License.
+
+3.3. Required Notices.
+
+You must include a notice in each of Your Modifications that identifies
+You as the Contributor of the Modification. You may not remove or alter
+any copyright, patent or trademark notices contained within the Covered
+Software, or any notices of licensing or any descriptive text giving
+attribution to any Contributor or the Initial Developer.
+
+3.4. Application of Additional Terms.
+
+You may not offer or impose any terms on any Covered Software in Source
+Code form that alters or restricts the applicable version of this License
+or the recipients' rights hereunder. You may choose to offer, and to charge
+a fee for, warranty, support, indemnity or liability obligations to one or
+more recipients of Covered Software. However, you may do so only on Your
+own behalf, and not on behalf of the Initial Developer or any Contributor.
+You must make it absolutely clear that any such warranty, support, indemnity
+or liability obligation is offered by You alone, and You hereby agree to
+indemnify the Initial Developer and every Contributor for any liability
+incurred by the Initial Developer or such Contributor as a result of
+warranty, support, indemnity or liability terms You offer.
+
+3.5. Distribution of Executable Versions.
+
+You may distribute the Executable form of the Covered Software under
+the terms of this License or under the terms of a license of Your choice,
+which may contain terms different from this License, provided that You are
+in compliance with the terms of this License and that the license for the
+Executable form does not attempt to limit or alter the recipient's rights
+in the Source Code form from the rights set forth in this License. If You
+distribute the Covered Software in Executable form under a different
+license, You must make it absolutely clear that any terms which differ
+from this License are offered by You alone, not by the Initial Developer
+or Contributor. You hereby agree to indemnify the Initial Developer and
+every Contributor for any liability incurred by the Initial Developer or
+such Contributor as a result of any such terms You offer.
+
+3.6. Larger Works.
+
+You may create a Larger Work by combining Covered Software with other
+code not governed by the terms of this License and distribute the Larger
+Work as a single product. In such a case, You must make sure the
+requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+4.1. New Versions.
+
+Sun Microsystems, Inc. is the initial license steward and may publish
+revised and/or new versions of this License from time to time. Each
+version will be given a distinguishing version number. Except as provided
+in Section 4.3, no one other than the license steward has the right to
+modify this License.
+
+4.2. Effect of New Versions.
+
+You may always continue to use, distribute or otherwise make the
+Covered Software available under the terms of the version of the License
+under which You originally received the Covered Software. If the Initial
+Developer includes a notice in the Original Software prohibiting it from
+being distributed or otherwise made available under any subsequent
+version of the License, You must distribute and make the Covered Software
+available under the terms of the version of the License under which You
+originally received the Covered Software. Otherwise, You may also choose
+to use, distribute or otherwise make the Covered Software available under
+the terms of any subsequent version of the License published by the
+license steward.
+
+4.3. Modified Versions.
+
+When You are an Initial Developer and You want to create a new license
+for Your Original Software, You may create and use a modified version
+of this License if You: (a) rename the license and remove any references
+to the name of the license steward (except to note that the license
+differs from this License); and (b) otherwise make it clear that the
+license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE
+IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT,
+YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST
+OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY
+COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to
+     cure such breach within 30 days of becoming aware of the breach.
+     Provisions which, by their nature, must remain in effect beyond the
+     termination of this License shall survive.
+
+6.2. If You assert a patent infringement claim (excluding declaratory
+     judgment actions) against Initial Developer or a Contributor (the
+     Initial Developer or Contributor against whom You assert such claim
+     is referred to as "Participant") alleging that the Participant
+     Software (meaning the Contributor Version where the Participant is
+     a Contributor or the Original Software where the Participant is the
+     Initial Developer) directly or indirectly infringes any patent, then
+     any and all rights granted directly or indirectly to You by such
+     Participant, the Initial Developer (if the Initial Developer is not
+     the Participant) and all Contributors under Sections 2.1 and/or 2.2
+     of this License shall, upon 60 days notice from Participant terminate
+     prospectively and automatically at the expiration of such 60 day
+     notice period, unless if within such 60 day period You withdraw Your
+     claim with respect to the Participant Software against such
+     Participant either unilaterally or pursuant to a written agreement
+     with Participant.
+
+6.3. If You assert a patent infringement claim against Participant
+     alleging that the Participant Software directly or indirectly
+     infringes any patent where such claim is resolved (such as by
+     license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+6.4. In the event of termination under Sections 6.1 or 6.2 above, all end
+     user licenses that have been validly granted by You or any distributor
+     hereunder prior to termination (excluding licenses granted to You by
+     any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
+SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
+FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES,
+EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH
+DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR
+DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE
+EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL
+DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a "commercial item," as that term is defined in
+48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software"
+(as that term is defined at 48 C.F.R. ß 252.227-7014(a)(1)) and "commercial
+computer software documentation" as such terms are used in 48 C.F.R. 12.212
+(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+Covered Software with only those rights set forth herein. This U.S.
+Government Rights clause is in lieu of, and supersedes, any other FAR,
+DFAR, or other clause or provision that addresses Government rights in
+computer software under this License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject matter
+hereof. If any provision of this License is held to be unenforceable,
+such provision shall be reformed only to the extent necessary to make it
+enforceable. This License shall be governed by the law of the jurisdiction
+specified in a notice contained within the Original Software (except to
+the extent applicable law, if any, provides otherwise), excluding such
+jurisdiction's conflict-of-law provisions. Any litigation relating to this
+License shall be subject to the jurisdiction of the courts located in the
+jurisdiction and venue specified in a notice contained within the Original
+Software, with the losing party responsible for costs, including, without
+limitation, court costs and reasonable attorneys' fees and expenses. The
+application of the United Nations Convention on Contracts for the
+International Sale of Goods is expressly excluded. Any law or regulation
+which provides that the language of a contract shall be construed against
+the drafter shall not apply to this License. You agree that You alone are
+responsible for compliance with the United States export administration
+regulations (and the export control laws and regulation of any other
+countries) when You use, distribute or otherwise make available any
+Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is responsible
+ for claims and damages arising, directly or indirectly, out of its
+utilization of rights under this License and You agree to work with Initial
+Developer and Contributors to distribute such responsibility on an equitable
+basis. Nothing herein is intended or shall be deemed to constitute any
+admission of liability.
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+LICENSE (CDDL)
+
+The code released under the CDDL shall be governed by the laws of the
+State of California (excluding conflict-of-law provisions). Any litigation
+relating to this License shall be subject to the jurisdiction of the
+Federal Courts of the Northern District of California and the state courts
+of the State of California, with venue lying in Santa Clara County,
+California.
+
+
+
+The GNU General Public License (GPL) Version 2, June 1991
+=========================================================
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to
+share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free software -- to
+make sure the software is free for all its users. This General Public
+License applies to most of the Free Software Foundation's software and to
+any other program whose authors commit to using it. (Some other Free
+Software Foundation software is covered by the GNU Library General Public
+License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price.
+Our General Public Licenses are designed to make sure that you have the
+freedom to distribute copies of free software (and charge for this service
+if you wish), that you receive source code or can get it if you want it,
+that you can change the software or use pieces of it in new free programs;
+and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to
+deny you these rights or to ask you to surrender the rights. These
+restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or
+for a fee, you must give the recipients all the rights that you have. You
+must make sure that they, too, receive or can get the source code. And
+you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If
+the software is modified by someone else and passed on, we want its
+recipients to know that what they have is not the original, so that any
+problems introduced by others will not reflect on the original authors'
+reputations.
+
+Finally, any free program is threatened constantly by software patents.
+We wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program
+proprietary. To prevent this, we have made it clear that any patent must
+be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+   placed by the copyright holder saying it may be distributed under the
+   terms of this General Public License. The "Program", below, refers to
+   any such program or work, and a "work based on the Program" means either
+   the Program or any derivative work under copyright law: that is to say,
+   a work containing the Program or a portion of it, either verbatim or with
+   modifications and/or translated into another language. (Hereinafter,
+   translation is included without limitation in the term "modification".)
+   Each licensee is addressed as "you".
+
+   Activities other than copying, distribution and modification are not
+   covered by this License; they are outside its scope. The act of running
+   the Program is not restricted, and the output from the Program is covered
+   only if its contents constitute a work based on the Program (independent
+   of having been made by running the Program). Whether that is true depends
+   on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code
+   as you receive it, in any medium, provided that you conspicuously and
+   appropriately publish on each copy an appropriate copyright notice and
+   disclaimer of warranty; keep intact all the notices that refer to this
+   License and to the absence of any warranty; and give any other recipients
+   of the Program a copy of this License along with the Program.
+
+   You may charge a fee for the physical act of transferring a copy, and
+   you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it,
+   thus forming a work based on the Program, and copy and distribute such
+   modifications or work under the terms of Section 1 above, provided that
+   you also meet all of these conditions:
+
+  a) You must cause the modified files to carry prominent notices stating
+     that you changed the files and the date of any change.
+
+  b) You must cause any work that you distribute or publish, that in whole
+     or in part contains or is derived from the Program or any part thereof,
+     to be licensed as a whole at no charge to all third parties under the
+     terms of this License.
+
+  c) If the modified program normally reads commands interactively when run,
+     you must cause it, when started running for such interactive use in
+     the most ordinary way, to print or display an announcement including
+     an appropriate copyright notice and a notice that there is no
+     warranty (or else, saying that you provide a warranty) and that users
+     may redistribute the program under these conditions, and telling the
+     user how to view a copy of this License. (Exception: if the Program
+     itself is interactive but does not normally print such an announcement,
+     your work based on the Program is not required to print an
+     announcement.)
+
+   These requirements apply to the modified work as a whole. If identifiable
+   sections of that work are not derived from the Program, and can be
+   reasonably considered independent and separate works in themselves,
+   then this License, and its terms, do not apply to those sections when
+   you distribute them as separate works. But when you distribute the same
+   sections as part of a whole which is a work based on the Program, the
+   distribution of the whole must be on the terms of this License, whose
+   permissions for other licensees extend to the entire whole, and thus to
+   each and every part regardless of who wrote it.
+
+   Thus, it is not the intent of this section to claim rights or contest
+   your rights to work written entirely by you; rather, the intent is to
+   exercise the right to control the distribution of derivative or
+   collective works based on the Program.
+
+   In addition, mere aggregation of another work not based on the Program
+   with the Program (or with a work based on the Program) on a volume of a
+   storage or distribution medium does not bring the other work under the
+   scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+   Section 2) in object code or executable form under the terms of
+   Sections 1 and 2 above provided that you also do one of the following:
+
+  a) Accompany it with the complete corresponding machine-readable source
+     code, which must be distributed under the terms of Sections 1 and 2
+     above on a medium customarily used for software interchange; or,
+
+  b) Accompany it with a written offer, valid for at least three years,
+     to give any third party, for a charge no more than your cost of
+     physically performing source distribution, a complete machine-readable
+     copy of the corresponding source code, to be distributed under the
+     terms of Sections 1 and 2 above on a medium customarily used for
+     software interchange; or,
+
+  c) Accompany it with the information you received as to the offer to
+     distribute corresponding source code. (This alternative is allowed
+     only for noncommercial distribution and only if you received the
+     program in object code or executable form with such an offer, in
+     accord with Subsection b above.)
+
+   The source code for a work means the preferred form of the work for
+   making modifications to it. For an executable work, complete source
+   code means all the source code for all modules it contains, plus any
+   associated interface definition files, plus the scripts used to control
+   compilation and installation of the executable. However, as a special
+   exception, the source code distributed need not include anything that
+   is normally distributed (in either source or binary form) with the
+   major components (compiler, kernel, and so on) of the operating system
+   on which the executable runs, unless that component itself accompanies
+   the executable.
+
+   If distribution of executable or object code is made by offering
+   access to copy from a designated place, then offering equivalent
+   access to copy the source code from the same place counts as
+   distribution of the source code, even though third parties are not
+   compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except
+   as expressly provided under this License. Any attempt otherwise to
+   copy, modify, sublicense or distribute the Program is void, and will
+   automatically terminate your rights under this License. However, parties
+   who have received copies, or rights, from you under this License will
+   not have their licenses terminated so long as such parties remain in
+   full compliance.
+
+5. You are not required to accept this License, since you have not signed
+   it. However, nothing else grants you permission to modify or distribute
+   the Program or its derivative works. These actions are prohibited by
+   law if you do not accept this License. Therefore, by modifying or
+   distributing the Program (or any work based on the Program), you
+   indicate your acceptance of this License to do so, and all its terms
+   and conditions for copying, distributing or modifying the Program or
+   works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+   Program), the recipient automatically receives a license from the
+   original licensor to copy, distribute or modify the Program subject to
+   these terms and conditions. You may not impose any further restrictions
+   on the recipients' exercise of the rights granted herein. You are not
+   responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+   infringement or for any other reason (not limited to patent issues),
+   conditions are imposed on you (whether by court order, agreement or
+   otherwise) that contradict the conditions of this License, they do not
+   excuse you from the conditions of this License. If you cannot distribute
+   so as to satisfy simultaneously your obligations under this License and
+   any other pertinent obligations, then as a consequence you may not
+   distribute the Program at all. For example, if a patent license would
+   not permit royalty-free redistribution of the Program by all those who
+   receive copies directly or indirectly through you, then the only way you
+   could satisfy both it and this License would be to refrain entirely from
+   distribution of the Program.
+
+   If any portion of this section is held invalid or unenforceable under
+   any particular circumstance, the balance of the section is intended to
+   apply and the section as a whole is intended to apply in other
+   circumstances.
+
+   It is not the purpose of this section to induce you to infringe any
+   patents or other property right claims or to contest validity of any
+   such claims; this section has the sole purpose of protecting the
+   integrity of the free software distribution system, which is
+   implemented by public license practices. Many people have made generous
+   contributions to the wide range of software distributed through that
+   system in reliance on consistent application of that system; it is up
+   to the author/donor to decide if he or she is willing to distribute
+   software through any other system and a licensee cannot impose that
+   choice.
+
+   This section is intended to make thoroughly clear what is believed
+   to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+   countries either by patents or by copyrighted interfaces, the original
+   copyright holder who places the Program under this License may add an
+   explicit geographical distribution limitation excluding those countries,
+   so that distribution is permitted only in or among countries not thus
+   excluded. In such case, this License incorporates the limitation as
+   if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+   of the General Public License from time to time. Such new versions
+   will be similar in spirit to the present version, but may differ in
+   detail to address new problems or concerns.
+
+   Each version is given a distinguishing version number. If the Program
+   specifies a version number of this License which applies to it and
+   "any later version", you have the option of following the terms and
+   conditions either of that version or of any later version published by
+   the Free Software Foundation. If the Program does not specify a
+   version number of this License, you may choose any version ever
+   published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free
+   programs whose distribution conditions are different, write to the author
+   to ask for permission. For software which is copyrighted by the Free
+   Software Foundation, write to the Free Software Foundation; we sometimes
+   make exceptions for this. Our decision will be guided by the two goals
+   of preserving the free status of all derivatives of our free software
+   and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+   FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT
+   WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER
+   PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
+   EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+   THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS
+   WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+   ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+   WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+   REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+   DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+   DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING
+   BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+   LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO
+   OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY
+   HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it free
+software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+One line to give the program's name and a brief idea of what it does.
+
+        Copyright (C) <year> <name of author>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Also add information on how to contact you by electronic and paper
+mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+  Gnomovision version 69, Copyright (C) year name of author Gnomovision
+  comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is
+  free software, and you are welcome to redistribute it under certain
+  conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may be
+called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+   Yoyodyne, Inc., hereby disclaims all copyright interest in the
+   program `Gnomovision' (which makes passes at compilers) written by
+   James Hacker.
+
+   signature of Ty Coon, 1 April 1989
+   Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+Certain source files distributed by Sun Microsystems, Inc.† are subject to
+the following clarification and special exception to the GPL Version 2,
+but only where Sun has expressly included in the particular source file's
+header the words "Sun designates this particular file as subject to the
+"Classpath" exception as provided by Sun in the License file that
+accompanied this code."
+
+†† Linking this library statically or dynamically with other modules is
+making a combined work based on this library.† Thus, the terms and
+conditions of the GNU General Public License Version 2 cover the whole
+combination.
+
+†† As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent modules,
+and to copy and distribute the resulting executable under terms of your
+choice, provided that you also meet, for each linked independent module,
+the terms and conditions of the license of that module.† An independent
+module is a module which is not derived from or based on this library.† If
+you modify this library, you may extend this exception to your version of
+the library, but you are not obligated to do so.† If you do not wish to do
+so, delete this exception statement from your version.
+
+

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d02ab99c/utils/jmx/jmxmp-ssl-agent/src/main/license/NOTICE.shaded
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/src/main/license/NOTICE.shaded b/utils/jmx/jmxmp-ssl-agent/src/main/license/NOTICE.shaded
new file mode 100644
index 0000000..5f93283
--- /dev/null
+++ b/utils/jmx/jmxmp-ssl-agent/src/main/license/NOTICE.shaded
@@ -0,0 +1,15 @@
+Apache Brooklyn
+Copyright 2014-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+-----------------------------------------------------------------------------
+
+This package incorporates the binaries of Project OpenDMK, JMX(TM) Remote API
+RI, Optional Packages.
+
+Per the requirements of paragraph 3.1 of the COMMON DEVELOPMENT AND
+DISTRIBUTION LICENSE (CDDL)Version 1.0, please be informed that the source
+code for the OpenDMK portions of this package may be obtained from:
+https://opendmk.java.net/download/index.html


[09/19] incubator-brooklyn git commit: LICENSE/NOTICE for binary distribution

Posted by he...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f5bf31f5/usage/dist/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/license/LICENSE b/usage/dist/src/main/license/LICENSE
new file mode 100644
index 0000000..4f1d572
--- /dev/null
+++ b/usage/dist/src/main/license/LICENSE
@@ -0,0 +1,1691 @@
+
+                                 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.
+
+-----------------------------------------------------------------------------
+
+The following files are distributed under the Apache License v2:
+
+commons-beanutils-commons-beanutils-1.9.1.jar
+commons-codec-commons-codec-1.6.jar
+commons-collections-commons-collections-3.2.1.jar
+commons-io-commons-io-2.4.jar
+commons-lang-commons-lang-2.4.jar
+commons-logging-commons-logging-1.1.1.jar
+org.apache.brooklyn-brooklyn-all-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-api-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-camp-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-cli-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-core-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-jmxmp-agent-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-jmxrmi-agent-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-launcher-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-locations-jclouds-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-logback-includes-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-policy-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-rest-api-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-rest-server-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-software-base-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-software-database-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-software-messaging-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-software-monitoring-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-software-network-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-software-nosql-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-software-osgi-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-software-webapp-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-utils-common-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-utils-groovy-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn-brooklyn-utils-rest-swagger-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn.camp-camp-base-0.7.0-SNAPSHOT.jar
+org.apache.brooklyn.camp-camp-server-0.7.0-SNAPSHOT.jar
+org.apache.commons-commons-compress-1.4.jar
+org.apache.commons-commons-lang3-3.1.jar
+org.apache.felix-org.apache.felix.framework-4.4.0.jar
+org.apache.httpcomponents-httpclient-4.2.5.jar
+org.apache.httpcomponents-httpcore-4.2.5.jar
+org.apache.jclouds-jclouds-allblobstore-1.9.0.jar
+org.apache.jclouds-jclouds-allcompute-1.9.0.jar
+org.apache.jclouds-jclouds-blobstore-1.9.0.jar
+org.apache.jclouds-jclouds-compute-1.9.0.jar
+org.apache.jclouds-jclouds-core-1.9.0.jar
+org.apache.jclouds-jclouds-scriptbuilder-1.9.0.jar
+org.apache.jclouds.api-atmos-1.9.0.jar
+org.apache.jclouds.api-byon-1.9.0.jar
+org.apache.jclouds.api-cloudfiles-1.9.0.jar
+org.apache.jclouds.api-cloudstack-1.9.0.jar
+org.apache.jclouds.api-ec2-1.9.0.jar
+org.apache.jclouds.api-elasticstack-1.9.0.jar
+org.apache.jclouds.api-filesystem-1.9.0.jar
+org.apache.jclouds.api-openstack-keystone-1.9.0.jar
+org.apache.jclouds.api-openstack-nova-1.9.0.jar
+org.apache.jclouds.api-openstack-nova-ec2-1.9.0.jar
+org.apache.jclouds.api-openstack-swift-1.9.0.jar
+org.apache.jclouds.api-rackspace-cloudidentity-1.9.0.jar
+org.apache.jclouds.api-s3-1.9.0.jar
+org.apache.jclouds.api-sts-1.9.0.jar
+org.apache.jclouds.api-swift-1.9.0.jar
+org.apache.jclouds.common-openstack-common-1.9.0.jar
+org.apache.jclouds.driver-jclouds-bouncycastle-1.9.0.jar
+org.apache.jclouds.driver-jclouds-okhttp-1.9.0.jar
+org.apache.jclouds.driver-jclouds-slf4j-1.9.0.jar
+org.apache.jclouds.driver-jclouds-sshj-1.9.0.jar
+org.apache.jclouds.labs-abiquo-1.9.0.jar
+org.apache.jclouds.labs-docker-1.9.0.jar
+org.apache.jclouds.labs-google-compute-engine-1.9.0.jar
+org.apache.jclouds.labs-googlecloud-1.9.0.jar
+org.apache.jclouds.labs-oauth-1.9.0.jar
+org.apache.jclouds.provider-aws-ec2-1.9.0.jar
+org.apache.jclouds.provider-aws-s3-1.9.0.jar
+org.apache.jclouds.provider-azureblob-1.9.0.jar
+org.apache.jclouds.provider-cloudfiles-uk-1.9.0.jar
+org.apache.jclouds.provider-cloudfiles-us-1.9.0.jar
+org.apache.jclouds.provider-elastichosts-lon-b-1.9.0.jar
+org.apache.jclouds.provider-elastichosts-lon-p-1.9.0.jar
+org.apache.jclouds.provider-elastichosts-sat-p-1.9.0.jar
+org.apache.jclouds.provider-go2cloud-jhb1-1.9.0.jar
+org.apache.jclouds.provider-gogrid-1.9.0.jar
+org.apache.jclouds.provider-hpcloud-compute-1.9.0.jar
+org.apache.jclouds.provider-hpcloud-objectstorage-1.9.0.jar
+org.apache.jclouds.provider-openhosting-east1-1.9.0.jar
+org.apache.jclouds.provider-rackspace-cloudservers-uk-1.9.0.jar
+org.apache.jclouds.provider-rackspace-cloudservers-us-1.9.0.jar
+org.apache.jclouds.provider-serverlove-z1-man-1.9.0.jar
+org.apache.jclouds.provider-skalicloud-sdg-my-1.9.0.jar
+org.apache.jclouds.provider-softlayer-1.9.0.jar
+
+-----------------------------------------------------------------------------
+
+aopalliance-aopalliance-1.0.jar
+
+LICENCE: all the source code provided by AOP Alliance is Public Domain.
+http://aopalliance.sourceforge.net/
+
+-----------------------------------------------------------------------------
+
+ch.qos.logback-logback-classic-1.0.7.jar
+ch.qos.logback-logback-core-1.0.7.jar
+
+Logback: the reliable, generic, fast and flexible logging framework.
+Copyright (C) 1999-2012, QOS.ch. All rights reserved.
+
+This program and the accompanying materials are dual-licensed under
+either the terms of the Eclipse Public License v1.0 as published by
+the Eclipse Foundation
+
+  or (per the licensee's choosing)
+
+under the terms of the GNU Lesser General Public License version 2.1
+as published by the Free Software Foundation.
+
+The Eclipse Public License v1.0 is reproduced below.
+
+-----------------------------------------------------------------------------
+
+com.beust-jcommander-1.27.jar
+
+Copyright 2010 Cedric Beust cedric@beust.com
+Licensed under the Apache License v2.0
+
+-----------------------------------------------------------------------------
+
+com.fasterxml.jackson.core-jackson-annotations-2.4.0.jar
+com.fasterxml.jackson.core-jackson-core-2.4.2.jar
+com.fasterxml.jackson.core-jackson-databind-2.4.2.jar
+com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.4.2.jar
+com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.4.2.jar
+com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.4.2.jar
+
+Licensed under the Apache License v2.0
+
+-----------------------------------------------------------------------------
+
+com.google.code.findbugs-jsr305-2.0.1.jar
+
+Licensed under the 3-clause BSD License (reproduced below).
+
+-----------------------------------------------------------------------------
+
+com.google.code.gson-gson-2.2.2.jar
+
+Licensed under the Apache License, Version 2.0
+
+-----------------------------------------------------------------------------
+
+com.google.guava-guava-17.0.jar
+
+Licensed under the Apache License, Version 2.0
+
+-----------------------------------------------------------------------------
+
+com.google.http-client-google-http-client-1.18.0-rc.jar
+
+Licensed under the Apache License, Version 2.0
+
+-----------------------------------------------------------------------------
+
+com.google.inject-guice-3.0.jar
+com.google.inject.extensions-guice-assistedinject-3.0.jar
+com.google.inject.extensions-guice-multibindings-3.0.jar
+
+Licensed under the Apache License, Version 2.0
+
+-----------------------------------------------------------------------------
+
+com.googlecode.concurrentlinkedhashmap-concurrentlinkedhashmap-lru-1.0_jdk5.jar
+
+Licensed under the Apache License, Version 2.0
+
+-----------------------------------------------------------------------------
+
+com.jamesmurty.utils-java-xmlbuilder-0.4.jar
+
+Licensed under the Apache License v2.0
+
+-----------------------------------------------------------------------------
+
+com.jayway.jsonpath-json-path-0.9.1.jar
+
+Licensed under the Apache License v2.0
+
+-----------------------------------------------------------------------------
+
+com.jcraft-jsch.agentproxy.connector-factory-0.0.8.jar
+com.jcraft-jsch.agentproxy.core-0.0.8.jar
+com.jcraft-jsch.agentproxy.pageant-0.0.8.jar
+com.jcraft-jsch.agentproxy.sshagent-0.0.8.jar
+com.jcraft-jsch.agentproxy.sshj-0.0.8.jar
+com.jcraft-jsch.agentproxy.usocket-jna-0.0.8.jar
+com.jcraft-jsch.agentproxy.usocket-nc-0.0.8.jar
+
+Licensed under the 3-clause BSD License (reproduced below).
+
+-----------------------------------------------------------------------------
+
+com.maxmind.db-maxmind-db-0.3.4.jar
+com.maxmind.geoip2-geoip2-0.8.1.jar
+
+Licensed under the Apache License v2.0
+
+-----------------------------------------------------------------------------
+
+com.squareup.okhttp-okhttp-2.2.0.jar
+com.squareup.okio-okio-1.2.0.jar
+
+Licensed under the Apache License v2.0
+
+-----------------------------------------------------------------------------
+
+com.sun.jersey-jersey-core-1.18.1.jar
+com.sun.jersey-jersey-json-1.18.1.jar
+com.sun.jersey-jersey-server-1.18.1.jar
+com.sun.jersey-jersey-servlet-1.18.1.jar
+com.sun.jersey.contribs-jersey-multipart-1.18.1.jar
+org.jvnet.mimepull-mimepull-1.9.3.jar
+
+Dual licensed under 2 OSI approved licenses:
+- COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL - Version 1.1)
+- GNU General Public License (GPL - Version 2, June 1991) with the Classpath Exception
+
+The CDDL - Version 1.1 License is reproduced below.
+
+-----------------------------------------------------------------------------
+
+com.thoughtworks.xstream-xstream-1.4.7.jar
+
+Copyright (c) 2003-2006, Joe Walnes
+Copyright (c) 2006-2009, 2011 XStream Committers
+All rights reserved.
+
+Licensed under the 3-clause BSD License (reproduced below).
+
+-----------------------------------------------------------------------------
+
+com.wordnik-swagger-core_2.9.1-1.0.1.jar
+com.wordnik-swagger-jaxrs_2.9.1-1.0.1.jar
+
+Copyright 2015 Reverb Technologies, Inc.
+
+Licensed under the Apache License, Version 2.0
+
+-----------------------------------------------------------------------------
+
+dom4j-dom4j-1.6.1.jar
+
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+
+Redistribution and use of this software and associated documentation
+("Software"), with or without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistributions of source code must retain copyright
+   statements and notices.  Redistributions must also contain a
+   copy of this document.
+
+2. 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.
+
+3. The name "DOM4J" must not be used to endorse or promote
+   products derived from this Software without prior written
+   permission of MetaStuff, Ltd.  For written permission,
+   please contact dom4j-info@metastuff.com.
+
+4. Products derived from this Software may not be called "DOM4J"
+   nor may "DOM4J" appear in their names without prior written
+   permission of MetaStuff, Ltd. DOM4J is a registered
+   trademark of MetaStuff, Ltd.
+
+5. Due credit should be given to the DOM4J Project -
+   http://www.dom4j.org
+
+THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESSED 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
+METASTUFF, LTD. OR ITS CONTRIBUTORS 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.
+
+-----------------------------------------------------------------------------
+
+io.airlift-airline-0.6.jar
+
+Licensed under the Apache License v2.0
+
+-----------------------------------------------------------------------------
+
+javax.annotation-jsr250-api-1.0.jar
+javax.ws.rs-jsr311-api-1.1.1.jar
+
+Licensed under the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+Version 1.0 (reproduced below).
+
+-----------------------------------------------------------------------------
+
+javax.inject-javax.inject-1.jar
+javax.validation-validation-api-1.0.0.GA.jar
+
+Licensed under the Apache License, Version 2.0
+
+-----------------------------------------------------------------------------
+
+net.java.dev.jna-jna-4.0.0.jar
+net.java.dev.jna-jna-platform-4.0.0.jar
+
+JNA is dual-licensed under 2 alternative Open Source/Free
+licenses: LGPL 2.1 and Apache License 2.0. (starting with
+JNA version 4.0.0).
+
+-----------------------------------------------------------------------------
+
+net.minidev-json-smart-1.2.jar
+
+Licensed under the Apache License v2.0
+
+-----------------------------------------------------------------------------
+
+net.schmizz-sshj-0.8.1.jar
+
+Licensed under the Apache License v2.0
+
+-----------------------------------------------------------------------------
+
+org.99soft.guice-rocoto-6.2.jar
+
+Licensed under the Apache License v2.0
+
+-----------------------------------------------------------------------------
+
+org.bouncycastle-bcpkix-jdk15on-1.49.jar
+org.bouncycastle-bcprov-ext-jdk15on-1.49.jar
+
+Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+
+Licensed under the MIT License
+
+-----------------------------------------------------------------------------
+
+org.codehaus.groovy-groovy-all-2.3.4.jar
+org.codehaus.jackson-jackson-core-asl-1.9.13.jar
+org.codehaus.jackson-jackson-jaxrs-1.9.13.jar
+org.codehaus.jackson-jackson-mapper-asl-1.9.13.jar
+org.codehaus.jackson-jackson-xc-1.9.13.jar
+org.codehaus.jettison-jettison-1.1.jar
+
+Licensed under the Apache License, Version 2.0
+
+-----------------------------------------------------------------------------
+
+org.eclipse.jetty-jetty-continuation-8.1.4.v20120524.jar
+org.eclipse.jetty-jetty-http-8.1.4.v20120524.jar
+org.eclipse.jetty-jetty-io-8.1.4.v20120524.jar
+org.eclipse.jetty-jetty-security-8.1.4.v20120524.jar
+org.eclipse.jetty-jetty-server-8.1.4.v20120524.jar
+org.eclipse.jetty-jetty-servlet-8.1.4.v20120524.jar
+org.eclipse.jetty-jetty-util-8.1.4.v20120524.jar
+org.eclipse.jetty-jetty-webapp-8.1.4.v20120524.jar
+org.eclipse.jetty-jetty-xml-8.1.4.v20120524.jar
+org.eclipse.jetty.orbit-javax.servlet-3.0.0.v201112011016.jar
+
+Jetty 8 is dual licensed under the Apache License 2.0 and Eclipse Public License 1.0
+
+-----------------------------------------------------------------------------
+
+org.freemarker-freemarker-2.3.19.jar
+
+Copyright 2014 Attila Szegedi, Daniel Dekany, Jonathan Revusky
+
+Licensed under the Apache License, Version 2.0
+
+-----------------------------------------------------------------------------
+
+org.glassfish.external-opendmk_jmxremote_optional_jar-1.0-b01-ea.jar
+
+Project OpenDMK, JMX(TM) Remote API RI, Optional Packages.
+Copyright © 2007 Sun Microsystems,  Inc.,  4150 Network Circle,   Santa Clara,
+California 95054, U.S.A. All rights reserved.
+
+Dual licensed under the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+Version 1.0 and the GNU General Public License Version 2. The CDDL License
+Version 1.0 is reproduced below.
+
+-----------------------------------------------------------------------------
+
+org.hibernate-jtidy-r8-20060801.jar
+Java HTML Tidy - JTidy
+HTML parser and pretty printer
+
+Copyright (c) 1998-2000 World Wide Web Consortium (Massachusetts
+Institute of Technology, Institut National de Recherche en
+Informatique et en Automatique, Keio University). All Rights
+Reserved.
+
+Contributing Author(s):
+
+   Dave Raggett <ds...@w3.org>
+   Andy Quick <ac...@sympatico.ca> (translation to Java)
+   Gary L Peskin <ga...@firstech.com> (Java development)
+   Sami Lempinen <sa...@lempinen.net> (release management)
+   Fabrizio Giustina <fgiust at users.sourceforge.net>
+
+The contributing author(s) would like to thank all those who
+helped with testing, bug fixes, and patience.  This wouldn't
+have been possible without all of you.
+
+COPYRIGHT NOTICE:
+
+This software and documentation is provided "as is," and
+the copyright holders and contributing author(s) make no
+representations or warranties, express or implied, including
+but not limited to, warranties of merchantability or fitness
+for any particular purpose or that the use of the software or
+documentation will not infringe any third party patents,
+copyrights, trademarks or other rights.
+
+The copyright holders and contributing author(s) will not be
+liable for any direct, indirect, special or consequential damages
+arising out of any use of the software or documentation, even if
+advised of the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute
+this source code, or portions hereof, documentation and executables,
+for any purpose, without fee, subject to the following restrictions:
+
+1. The origin of this source code must not be misrepresented.
+2. Altered versions must be plainly marked as such and must
+   not be misrepresented as being the original source.
+3. This Copyright notice may not be removed or altered from any
+   source or altered source distribution.
+
+The copyright holders and contributing author(s) specifically
+permit, without fee, and encourage the use of this source code
+as a component for supporting the Hypertext Markup Language in
+commercial products. If you use this source code in a product,
+acknowledgment is not required but would be appreciated.
+
+-----------------------------------------------------------------------------
+
+org.javassist-javassist-3.16.1-GA.jar
+
+Licensed under the Apache License, Version 2.0, or the GNU Lesser General
+Public License Version 2.1 or later, or MOZILLA PUBLIC LICENSE Version 1.1.
+
+-----------------------------------------------------------------------------
+
+org.mongodb-mongo-java-driver-2.11.4.jar
+
+Licensed under the Apache License, Version 2.0
+
+-----------------------------------------------------------------------------
+
+org.reflections-reflections-0.9.9-RC1.jar
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sa...@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+
+-----------------------------------------------------------------------------
+
+org.scala-lang-scala-library-2.9.1-1.jar
+
+Copyright (c) 2002-2012 EPFL, Lausanne, unless otherwise specified. All rights reserved.
+
+Licensed under the 3-clause BSD License (reproduced below).
+
+-----------------------------------------------------------------------------
+
+org.slf4j-jul-to-slf4j-1.6.6.jar
+org.slf4j-slf4j-api-1.6.6.jar
+
+Copyright (c) 2004-2013 QOS.ch
+
+Licensed under the MIT License (reproduced below).
+
+-----------------------------------------------------------------------------
+
+org.tukaani-xz-1.0.jar
+
+This Java implementation of XZ has been put into the public domain, thus you
+can do whatever you want with it. All the files in the package have been
+written by Lasse Collin, but some files are heavily based on public domain
+code written by Igor Pavlov.
+
+-----------------------------------------------------------------------------
+
+org.yaml-snakeyaml-1.11.jar
+
+Licensed under the Apache License, Version 2.0
+
+-----------------------------------------------------------------------------
+
+xml-apis-xml-apis-1.0.b2.jar
+
+Composed of materials with the following licenses:
+
+----------
+
+SAX2 is Free!
+
+I hereby abandon any property rights to SAX 2.0 (the Simple API for
+XML), and release all of the SAX 2.0 source code, compiled code, and
+documentation contained in this distribution into the Public Domain.
+SAX comes with NO WARRANTY or guarantee of fitness for any
+purpose.
+
+David Megginson, david@megginson.com
+2000-05-05
+
+----------
+
+W3C® SOFTWARE NOTICE AND LICENSE
+Copyright © 1994-2001 World
+Wide Web Consortium, <a href="http://www.w3.org/">World
+Wide Web Consortium</a>, (<a href=
+"http://www.lcs.mit.edu/">Massachusetts Institute of
+Technology</a>, <a href="http://www.inria.fr/">Institut National de
+Recherche en Informatique et en Automatique</a>, <a href=
+"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+This W3C work (including software, documents, or other related
+items) is being provided by the copyright holders under the
+following license. By obtaining, using and/or copying this work,
+you (the licensee) agree that you have read, understood, and will
+comply with the following terms and conditions:
+Permission to use, copy, modify, and distribute this software
+and its documentation, with or without modification,  for any
+purpose and without fee or royalty is hereby granted, provided that
+you include the following on ALL copies of the software and
+documentation or portions thereof, including modifications, that
+you make:
+
+The full text of this NOTICE in a location viewable to users of
+the redistributed or derivative work.
+
+Any pre-existing intellectual property disclaimers, notices, or
+terms and conditions. If none exist, a short notice of the
+following form (hypertext is preferred, text is permitted) should
+be used within the body of any redistributed or derivative code:
+"Copyright © [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of
+Technology, Institut National de
+Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/"
+
+Notice of any changes or modifications to the W3C files,
+including the date changes were made. (We recommend you provide
+URIs to the location from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
+COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
+USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
+PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
+SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
+SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without
+specific, written prior permission. Title to copyright in this
+software and any associated documentation will at all times remain
+with copyright holders.
+
+----------
+
+W3C® DOCUMENT NOTICE AND LICENSE
+Copyright © 1994-2001 World
+Wide Web Consortium, <a href="http://www.w3.org/">World
+Wide Web Consortium</a>, (<a href=
+"http://www.lcs.mit.edu/">Massachusetts Institute of
+Technology</a>, <a href="http://www.inria.fr/">Institut National de
+Recherche en Informatique et en Automatique</a>, <a href=
+"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+Public documents on the W3C site are provided by the copyright
+holders under the following license. The software or Document Type
+Definitions (DTDs) associated with W3C specifications are governed
+by the Software Notice. By using and/or copying this document, or the
+W3C document from which this statement is linked, you (the
+licensee) agree that you have read, understood, and will comply
+with the following terms and conditions:
+
+Permission to use, copy, and distribute the contents of this
+document, or the W3C document from which this statement is linked,
+in any medium for any purpose and without fee or royalty is hereby
+granted, provided that you include the following on ALL
+copies of the document, or portions thereof, that you use:
+
+A link or URL to the original W3C document.
+
+The pre-existing copyright notice of the original author, or if
+it doesn't exist, a notice of the form: "Copyright © [$date-of-document] World Wide Web
+Consortium, (Massachusetts
+Institute of Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio
+University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but a
+textual representation is permitted.)
+
+If it exists, the STATUS of the W3C document.
+
+When space permits, inclusion of the full text of this NOTICE
+should be provided. We request that authorship
+attribution be provided in any software, documents, or other items
+or products that you create pursuant to the implementation of the
+contents of this document, or any portion thereof.
+
+No right to create modifications or derivatives of W3C documents
+is granted pursuant to this license. However, if additional
+requirements (documented in the Copyright
+FAQ) are satisfied, the right to create modifications or
+derivatives is sometimes granted by the W3C to individuals
+complying with those requirements.
+
+THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
+REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT
+NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS
+OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
+IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
+SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
+DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS
+THEREOF.
+
+The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to this document or its
+contents without specific, written prior permission. Title to
+copyright in this document will at all times remain with copyright
+holders.
+
+-----------------------------------------------------------------------------
+
+xmlpull-xmlpull-1.1.3.1.jar
+
+All of the XMLPULL API source code, compiled code, and documentation
+contained in this distribution *except* for tests (see separate LICENSE_TESTS.txt)
+are in the Public Domain.
+
+XMLPULL API comes with NO WARRANTY or guarantee of fitness for any purpose.
+
+Initial authors:
+
+  Stefan Haustein
+  Aleksander Slominski
+
+-----------------------------------------------------------------------------
+
+xpp3-xpp3_min-1.1.4c.jar
+
+Indiana University Extreme! Lab Software License
+
+Version 1.1.1
+
+Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. 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.
+
+3. The end-user documentation included with the redistribution, if any,
+   must include the following acknowledgment:
+
+  "This product includes software developed by the Indiana University
+  Extreme! Lab (http://www.extreme.indiana.edu/)."
+
+Alternately, this acknowledgment may appear in the software itself,
+if and wherever such third-party acknowledgments normally appear.
+
+4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab"
+must not be used to endorse or promote products derived from this
+software without prior written permission. For written permission,
+please contact http://www.extreme.indiana.edu/.
+
+5. Products derived from this software may not use "Indiana Univeristy"
+name nor may "Indiana Univeristy" appear in their name, without prior
+written permission of the Indiana University.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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 THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
+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.
+
+-----------------------------------------------------------------------------
+
+The MIT License ("MIT")
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-----------------------------------------------------------------------------
+
+The BSD 3-Clause License ("New BSD")
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. 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.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may 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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+
+-----------------------------------------------------------------------------
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and b) in the case of each subsequent
+Contributor: i) changes to the Program, and ii) additions to the Program;
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or
+anyone acting on such Contributor's behalf. Contributions do not include
+additions to the Program which: (i) are separate modules of software
+distributed in conjunction with the Program under their own license agreement,
+and (ii) are not derivative works of the Program. "Contributor" means any
+person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and
+such derivative works, in source code and object code form. b) Subject to the
+terms of this Agreement, each Contributor hereby grants Recipient a
+non-exclusive, worldwide, royalty-free patent license under Licensed Patents
+to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form.
+This patent license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the
+Licensed Patents. The patent license shall not apply to any other combinations
+which include the Contribution. No hardware per se is licensed hereunder. c)
+Recipient understands that although each Contributor grants the licenses to
+its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other
+intellectual property rights of any other entity. Each Contributor disclaims
+any liability to Recipient for claims brought by any other entity based on
+infringement of intellectual property rights or otherwise. As a condition to
+exercising the rights and licenses granted hereunder, each Recipient hereby
+assumes sole responsibility to secure any other intellectual property rights
+needed, if any. For example, if a third party patent license is required to
+allow Recipient to distribute the Program, it is Recipient's responsibility to
+acquire that license before distributing the Program. d) Each Contributor
+represents that to its knowledge it has sufficient copyright rights in its
+Contribution, if any, to grant the copyright license set forth in this
+Agreement. 3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and b) its
+license agreement: i) effectively disclaims on behalf of all Contributors all
+warranties and conditions, express and implied, including warranties or
+conditions of title and non-infringement, and implied warranties or conditions
+of merchantability and fitness for a particular purpose; ii) effectively
+excludes on behalf of all Contributors all liability for damages, including
+direct, indirect, special, incidental and consequential damages, such as lost
+profits; iii) states that any provisions which differ from this Agreement are
+offered by that Contributor alone and not by any other party; and iv) states
+that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange. When the Program is made
+available in source code form:
+
+a) it must be made available under this Agreement; and b) a copy of this
+Agreement must be included with each copy of the Program. Contributors may not
+remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if any, in a manner that reasonably allows subsequent Recipients to identify
+the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore,
+if a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits and
+other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such Commercial
+Contributor in connection with its distribution of the Program in a commercial
+product offering. The obligations in this section do not apply to any claims
+or Losses relating to any actual or alleged intellectual property
+infringement. In order to qualify, an Indemnified Contributor must: a)
+promptly notify the Commercial Contributor in writing of such claim, and b)
+allow the Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If
+that Commercial Contributor then makes performance claims, or offers
+warranties related to Product X, those performance claims and warranties are
+such Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to the
+risks and costs of program errors, compliance with applicable laws, damage to
+or loss of data, programs or equipment, and unavailability or interruption of
+operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of the
+remainder of the terms of this Agreement, and without further action by the
+parties hereto, such provision shall be reformed to the minimum extent
+necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted
+under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to
+time. No one other than the Agreement Steward has the right to modify this
+Agreement. The Eclipse Foundation is the initial Agreement Steward. The
+Eclipse Foundation may assign the responsibility to serve as the Agreement
+Steward to a suitable separate entity. Each new version of the Agreement will
+be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version of the
+Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly
+stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+licenses to the intellectual property of any Contributor under this Agreement,
+whether expressly, by implication, estoppel or otherwise. All rights in the
+Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation.
+
+-----------------------------------------------------------------------------
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+Definitions.
+
+1.1. Contributor means each individual or entity that creates or contributes
+to the creation of Modifications.
+
+1.2. Contributor Version means the combination of the Original Software, prior
+Modifications used by a Contributor (if any), and the Modifications made by
+that particular Contributor.
+
+1.3. Covered Software means (a) the Original Software, or (b) Modifications,
+or (c) the combination of files containing Original Software with files
+containing Modifications, in each case including portions thereof.
+
+1.4. Executable means the Covered Software in any form other than Source Code.
+
+1.5. Initial Developer means the individual or entity that first makes
+Original Software available under this License.
+
+1.6. Larger Work means a work which combines Covered Software or portions
+thereof with code not governed by the terms of this License.
+
+1.7. License means this document.
+
+1.8. Licensable means having the right to grant, to the maximum extent
+possible, whether at the time of the initial grant or subsequently acquired,
+any and all of the rights conveyed herein.
+
+1.9. Modifications means the Source Code and Executable form of any of the
+following: A. Any file that results from an addition to, deletion from or
+modification of the contents of a file containing Original Software or
+previous Modifications; B. Any new file that contains any part of the Original
+Software or previous Modification; or C. Any new file that is contributed or
+otherwise made available under the terms of this License.
+
+1.10. Original Software means the Source Code and Executable form of computer
+software code that is originally released under this License.
+
+1.11. Patent Claims means any patent claim(s), now owned or hereafter
+acquired, including without limitation, method, process, and apparatus claims,
+in any patent Licensable by grantor.
+
+1.12. Source Code means (a) the common form of computer software code in which
+modifications are made and (b) associated documentation included in or with
+such code.
+
+1.13. You (or Your) means an individual or a legal entity exercising rights
+under, and complying with all of the terms of, this License. For legal
+entities, You includes any entity which controls, is controlled by, or is
+under common control with You. For purposes of this definition, control means
+(a) the power, direct or indirect, to cause the direction or management of
+such entity, whether by contract or otherwise, or (b) ownership of more than
+fifty percent (50%) of the outstanding shares or beneficial ownership of such
+entity.
+
+2. License Grants.
+
+ 2.1. The Initial Developer Grant. Conditioned upon Your compliance with
+ Section 3.1 below and subject to third party intellectual property claims,
+ the Initial Developer hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+Licensable by Initial Developer, to use, reproduce, modify, display, perform,
+sublicense and distribute the Original Software (or portions thereof), with or
+without Modifications, and/or as part of a Larger Work; and
+
+(b) under Patent Claims infringed by the making, using or selling of Original
+Software, to make, have made, use, practice, sell, and offer for sale, and/or
+otherwise dispose of the Original Software (or portions thereof);
+
+ (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date
+ Initial Developer first distributes or otherwise makes the Original Software
+ available to a third party under the terms of this License;
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1)
+ for code that You delete from the Original Software, or (2) for infringements
+ caused by: (i) the modification of the Original Software, or (ii) the
+ combination of the Original Software with other software or devices.
+
+2.2. Contributor Grant. Conditioned upon Your compliance with Section 3.1
+below and subject to third party intellectual property claims, each
+Contributor hereby grants You a world-wide, royalty-free, non-exclusive
+license:
+
+(a) under intellectual property rights (other than patent or trademark)
+Licensable by Contributor to use, reproduce, modify, display, perform,
+sublicense and distribute the Modifications created by such Contributor (or
+portions thereof), either on an unmodified basis, with other Modifications, as
+Covered Software and/or as part of a Larger Work; and
+
+(b) under Patent Claims infringed by the making, using, or selling of
+Modifications made by that Contributor either alone and/or in combination with
+its Contributor Version (or portions of such combination), to make, use, sell,
+offer for sale, have made, and/or otherwise dispose of: (1) Modifications made
+by that Contributor (or portions thereof); and (2) the combination of
+Modifications made by that Contributor with its Contributor Version (or
+portions of such combination).
+
+(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the
+date Contributor first distributes or otherwise makes the Modifications
+available to a third party.
+
+(d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1)
+for any code that Contributor has deleted from the Contributor Version; (2)
+for infringements caused by: (i) third party modifications of Contributor
+Version, or (ii) the combination of Modifications made by that Contributor
+with other software (except as part of the Contributor Version) or other
+devices; or (3) under Patent Claims infringed by Covered Software in the
+absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+3.1. Availability of Source Code. Any Covered Software that You distribute or
+otherwise make available in Executable form must also be made available in
+Source Code form and that Source Code form must be distributed only under the
+terms of this License. You must include a copy of this License with every copy
+of the Source Code form of the Covered Software You distribute or otherwise
+make available. You must inform recipients of any such Covered Software in
+Executable form as to how they can obtain such Covered Software in Source Code
+form in a reasonable manner on or through a medium customarily used for
+software exchange.
+
+3.2. Modifications. The Modifications that You create or to which You
+contribute are governed by the terms of this License. You represent that You
+believe Your Modifications are Your original creation(s) and/or You have
+sufficient rights to grant the rights conveyed by this License.
+
+3.3. Required Notices. You must include a notice in each of Your Modifications
+that identifies You as the Contributor of the Modification. You may not remove
+or alter any copyright, patent or trademark notices contained within the
+Covered Software, or any notices of licensing or any descriptive text giving
+attribution to any Contributor or the Initial Developer.
+
+3.4. Application of Additional Terms. You may not offer or impose any terms on
+any Covered Software in Source Code form that alters or restricts the
+applicable version of this License or the recipients rights hereunder. You may
+choose to offer, and to charge a fee for, warranty, support, indemnity or
+liability obligations to one or more recipients of Covered Software. However,
+you may do so only on Your own behalf, and not on behalf of the Initial
+Developer or any Contributor. You must make it absolutely clear that any such
+warranty, support, indemnity or liability obligation is offered by You alone,
+and You hereby agree to indemnify the Initial Developer and every Contributor
+for any liability incurred by the Initial Developer or such Contributor as a
+result of warranty, support, indemnity or liability terms You offer.
+
+3.5. Distribution of Executable Versions. You may distribute the Executable
+form of the Covered Software under the terms of this License or under the
+terms of a license of Your choice, which may contain terms different from this
+License, provided that You are in compliance with the terms of this License
+and that the license for the Executable form does not attempt to limit or
+alter the recipients rights in the Source Code form from the rights set forth
+in this License. If You distribute the Covered Software in Executable form
+under a different license, You must make it absolutely clear that any terms
+which differ from this License are offered by You alone, not by the Initial
+Developer or Contributor. You hereby agree to indemnify the Initial Developer
+and every Contributor for any liability incurred by the Initial Developer or
+such Contributor as a result of any such terms You offer.
+
+3.6. Larger Works. You may create a Larger Work by combining Covered Software
+with other code not governed by the terms of this License and distribute the
+Larger Work as a single product. In such a case, You must make sure the
+requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+4.1. New Versions. Sun Microsystems, Inc. is the initial license steward and
+may publish revised and/or new versions of this License from time to time.
+Each version will be given a distinguishing version number. Except as provided
+in Section 4.3, no one other than the license steward has the right to modify
+this License.
+
+4.2. Effect of New Versions. You may always continue to use, distribute or
+otherwise make the Covered Software available under the terms of the version
+of the License under which You originally received the Covered Software. If
+the Initial Developer includes a notice in the Original Software prohibiting
+it from being distributed or otherwise made available under any subsequent
+version of the License, You must distribute and make the Covered Software
+available under the terms of the version of the License under which You
+originally received the Covered Software. Otherwise, You may also choose to
+use, distribute or otherwise make the Covered Software available under the
+terms of any subsequent version of the License published by the license
+steward.
+
+4.3. Modified Versions. When You are an Initial Developer and You want to
+create a new license for Your Original Software, You may create and use a
+modified version of this License if You: (a) rename the license and remove any
+references to the name of the license steward (except to note that the license
+differs from this License); and (b) otherwise make it clear that the license
+contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY. COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON
+AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
+ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH
+YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
+SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
+ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED
+HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will terminate
+automatically if You fail to comply with terms herein and fail to cure such
+breach within 30 days of becoming aware of the breach. Provisions which, by
+their nature, must remain in effect beyond the termination of this License
+shall survive.
+
+6.2. If You assert a patent infringement claim (excluding declaratory judgment
+actions) against Initial Developer or a Contributor (the Initial Developer or
+Contributor against whom You assert such claim is referred to as Participant)
+alleging that the Participant Software (meaning the Contributor Version where
+the Participant is a Contributor or the Original Software where the
+Participant is the Initial Developer) directly or indirectly infringes any
+patent, then any and all rights granted directly or indirectly to You by such
+Participant, the Initial Developer (if the Initial Developer is not the
+Participant) and all Contributors under Sections 2.1 and/or 2.2 of this
+License shall, upon 60 days notice from Participant terminate prospectively
+and automatically at the expiration of such 60 day notice period, unless if
+within such 60 day period You withdraw Your claim with respect to the
+Participant Software against such Participant either unilaterally or pursuant
+to a written agreement with Participant.
+
+6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user
+licenses that have been validly granted by You or any distributor hereunder
+prior to termination (excluding licenses granted to You by any distributor)
+shall survive termination.
+
+7. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
+WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED
+SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER
+INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL,
+WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
+THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS
+NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS. The Covered Software is a commercial item, as
+that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of commercial
+computer software (as that term is defined at 48 C.F.R.  252.227-7014(a)(1))
+and commercial computer software documentation as such terms are used in 48
+C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.
+227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users
+acquire Covered Software with only those rights set forth herein. This U.S.
+Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR,
+or other clause or provision that addresses Government rights in computer
+software under this License.
+
+9. MISCELLANEOUS. This License represents the complete agreement concerning
+subject matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent necessary
+to make it enforceable. This License shall be governed by the law of the
+jurisdiction specified in a notice contained within the Original Software
+(except to the extent applicable law, if any, provides otherwise), excluding
+such jurisdictions conflict-of-law provisions. Any litigation relating to this
+License shall be subject to the jurisdiction of the courts located in the
+jurisdiction and venue specified in a notice contained within the Original
+Software, with the losing party responsible for costs, including, without
+limitation, court costs and reasonable attorneys fees and expenses. The
+application of the United Nations Convention on Contracts for the
+International Sale of Goods is expressly excluded. Any law or regulation which
+provides that the language of a contract shall be construed against the
+drafter shall not apply to this License. You agree that You alone are
+responsible for compliance with the United States export administration
+regulations (and the export control laws and regulation of any other
+countries) when You use, distribute or otherwise make available any Covered
+Software.
+
+10. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and the
+Contributors, each party is responsible for claims and damages arising,
+directly or indirectly, out of its utilization of rights under this License
+and You agree to work with Initial Developer and Contributors to distribute
+such responsibility on an equitable basis. Nothing herein is intended or shall
+be deemed to constitute any admission of liability.
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+LICENSE (CDDL) The code released under the CDDL shall be governed by the laws
+of the State of California (excluding conflict-of-law provisions). Any
+litigation relating to this License shall be subject to the jurisdiction of
+the Federal Courts of the Northern District of California and the state courts
+of the State of California, with venue lying in Santa Clara County,
+California.
+
+-----------------------------------------------------------------------------
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
+
+1. Definitions.
+
+1.1. “Contributor” means each individual or entity that creates or contributes
+to the creation of Modifications. 1.2. “Contributor Version” means the
+combination of the Original Software, prior Modifications used by a
+Contributor (if any), and the Modifications made by that particular
+Contributor. 1.3. “Covered Software” means (a) the Original Software, or (b)
+Modifications, or (c) the combination of files containing Original Software
+with files containing Modifications, in each case including portions thereof.
+1.4. “Executable” means the Covered Software in any form other than Source
+Code. 1.5. “Initial Developer” means the individual or entity that first makes
+Original Software available under this License. 1.6. “Larger Work” means a
+work which combines Covered Software or portions thereof with code not
+governed by the terms of this License. 1.7. “License” means this document.
+1.8. “Licensable” means having the right to grant, to the maximum extent
+possible, whether at the time of the initial grant or subsequently acquired,
+any and all of the rights conveyed herein. 1.9. “Modifications” means the
+Source Code and Executable form of any of the following: A. Any file that
+results from an addition to, deletion from or modification of the contents of
+a file containing Original Software or previous Modifications; B. Any new file
+that contains any part of the Original Software or previous Modification; or
+C. Any new file that is contributed or otherwise made available under the
+terms of this License. 1.10. “Original Software” means the Source Code and
+Executable form of computer software code that is originally released under
+this License. 1.11. “Patent Claims” means any patent claim(s), now owned or
+hereafter acquired, including without limitation, method, process, and
+apparatus claims, in any patent Licensable by grantor. 1.12. “Source Code”
+means (a) the common form of computer software code in which modifications are
+made and (b) associated documentation included in or with such code. 1.13.
+“You” (or “Your”) means an individual or a legal entity exercising rights
+under, and complying with all of the terms of, this License. For legal
+entities, “You” includes any entity which controls, is controlled by, or is
+under common control with You. For purposes of this definition, “control”
+means (a) the power, direct or indirect, to cause the direction or management
+of such entity, whether by contract or otherwise, or (b) ownership of more
+than fifty percent (50%) of the outstanding shares or beneficial ownership of
+such entity. 2. License Grants.
+
+2.1. The Initial Developer Grant. Conditioned upon Your compliance with
+Section 3.1 below and subject to third party intellectual property claims, the
+Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
+license: (a) under intellectual property rights (other than patent or
+trademark) Licensable by Initial Developer, to use, reproduce, modify,
+display, perform, sublicense and distribute the Original Software (or portions
+thereof), with or without Modifications, and/or as part of a Larger Work; and
+(b) under Patent Claims infringed by the making, using or selling of Original
+Software, to make, have made, use, practice, sell, and offer for sale, and/or
+otherwise dispose of the Original Software (or portions thereof). (c) The
+licenses granted in Sections 2.1(a) and (b) are effective on the date Initial
+Developer first distributes or otherwise makes the Original Software available
+to a third party under the terms of this License. (d) Notwithstanding Section
+2.1(b) above, no patent license is granted: (1) for code that You delete from
+the Original Software, or (2) for infringements caused by: (i) the
+modification of the Original Software, or (ii) the combination of the Original
+Software with other software or devices. 2.2. Contributor Grant. Conditioned
+upon Your compliance with Section 3.1 below and subject to third party
+intellectual property claims, each Contributor hereby grants You a world-wide,
+royalty-free, non-exclusive license: (a) under intellectual property rights
+(other than patent or trademark) Licensable by Contributor to use, reproduce,
+modify, display, perform, sublicense and distribute the Modifications created
+by such Contributor (or portions thereof), either on an unmodified basis, with
+other Modifications, as Covered Software and/or as part of a Larger Work; and
+(b) under Patent Claims infringed by the making, using, or selling of
+Modifications made by that Contributor either alone and/or in combination with
+its Contributor Version (or portions of such combination), to make, use, sell,
+offer for sale, have made, and/or otherwise dispose of: (1) Modifications made
+by that Contributor (or portions thereof); and (2) the combination of
+Modifications made by that Contributor with its Contributor Version (or
+portions of such combination). (c) The licenses granted in Sections 2.2(a) and
+2.2(b) are effective on the date Contributor first distributes or otherwise
+makes the Modifications available to a third party. (d) Notwithstanding
+Section 2.2(b) above, no patent license is granted: (1) for any code that
+Contributor has deleted from the Contributor Version; (2) for infringements
+caused by: (i) third party modifications of Contributor Version, or (ii) the
+combination of Modifications made by that Contributor with other software
+(except as part of the Contributor Version) or other devices; or (3) under
+Patent Claims infringed by Covered Software in the absence of Modifications
+made by that Contributor. 3. Distribution Obligations.
+
+3.1. Availability of Source Code. Any Covered Software that You distribute or
+otherwise make available in Executable form must also be made available in
+Source Code form and that Source Code form must be distributed only under the
+terms of this License. You must include a copy of this License with every copy
+of the Source Code form of the Covered Software You distribute or otherwise
+make available. You must inform recipients of any such Covered Software in
+Executable form as to how they can obtain such Covered Software in Source Code
+form in a reasonable manner on or through a medium customarily used for
+software exchange. 3.2. Modifications. The Modifications that You create or to
+which You contribute are governed by the terms of this License. You represent
+that You believe Your Modifications are Your original creation(s) and/or You
+have sufficient rights to grant the rights conveyed by this License. 3.3.
+Required Notices. You must include a notice in each of Your Modifications that
+identifies You as the Contributor of the Modification. You may not remove or
+alter any copyright, patent or trademark notices contained within the Covered
+Software, or any notices of licensing or any descriptive text giving
+attribution to any Contributor or the Initial Developer. 3.4. Application of
+Additional Terms. You may not offer or impose any terms on any Covered
+Software in Source Code form that alters or restricts the applicable version
+of this License or the recipients' rights hereunder. You may choose to offer,
+and to charge a fee for, warranty, support, indemnity or liability obligations
+to one or more recipients of Covered Software. However, you may do so only on
+Your own behalf, and not on behalf of the Initial Developer or any
+Contributor. You must make it absolutely clear that any such warranty,
+support, indemnity or liability obligation is offered by You alone, and You
+hereby agree to indemnify the Initial Developer and every Contributor for any
+liability incurred by the Initial Developer or such Contributor as a result of
+warranty, support, indemnity or liability terms You offer. 3.5. Distribution
+of Executable Versions. You may distribute the Executable form of the Covered
+Software under the terms of this License or under the terms of a license of
+Your choice, which may contain terms different from this License, provided
+that You are in compliance with the terms of this License and that the license
+for the Executable form does not attempt to limit or alter the recipient's
+rights in the Source Code form from the rights set forth in this License. If
+You distribute the Covered Software in Executable form under a different
+license, You must make it absolutely clear that any terms which differ from
+this License are offered by You alone, not by the Initial Developer or
+Contributor. You hereby agree to indemnify the Initial Developer and every
+Contributor for any liability incurred by the Initial Developer or such
+Contributor as a result of any such terms You offer. 3.6. Larger Works. You
+may create a Larger Work by combining Covered Software with other code not
+governed by the terms of this License and distribute the Larger Work as a
+single product. In such a case, You must make sure the requirements of this
+License are fulfilled for the Covered Software. 4. Versions of the License.
+
+4.1. New Versions. Oracle is the initial license steward and may publish
+revised and/or new versions of this License from time to time. Each version
+will be given a distinguishing version number. Except as provided in Section
+4.3, no one other than the license steward has the right to modify this
+License. 4.2. Effect of New Versions. You may always continue to use,
+distribute or otherwise make the Covered Software available under the terms of
+the version of the License under which You originally received the Covered
+Software. If the Initial Developer includes a notice in the Original Software
+prohibiting it from being distributed or otherwise made available under any
+subsequent version of the License, You must distribute and make the Covered
+Software available under the terms of the version of the License under which
+You originally received the Covered Software. Otherwise, You may also choose
+to use, distribute or otherwise make the Covered Software available under the
+terms of any subsequent version of the License published by the license
+steward. 4.3. Modified Versions. When You are an Initial Developer and You
+want to create a new license for Your Original Software, You may create and
+use a modified version of this License if You: (a) rename the license and
+remove any references to the name of the license steward (except to note that
+the license differs from this License); and (b) otherwise make it clear that
+the license contains terms which differ from this License. 5. DISCLAIMER OF
+WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS, WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
+LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
+MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK
+AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD
+ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL
+DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
+SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
+ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED
+HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will terminate
+automatically if You fail to comply with terms herein and fail to cure such
+breach within 30 days of becoming aware of the breach. Provisions which, by
+their nature, must remain in effect beyond the termination of this License
+shall survive. 6.2. If You assert a patent infringement claim (excluding
+declaratory judgment actions) against Initial Developer or a Contributor (the
+Initial Developer or Contributor against whom You assert such claim is
+referred to as “Participant”) alleging that the Participant Software (meaning
+the Contributor Version where the Participant is a Contributor or the Original
+Software where the Participant is the Initial Developer) directly or
+indirectly infringes any patent, then any and all rights granted directly or
+indirectly to You by such Participant, the Initial Developer (if the Initial
+Developer is not the Participant) and all Contributors under Sections 2.1
+and/or 2.2 of this License shall, upon 60 days notice from Participant
+terminate prospectively and automatically at the expiration of such 60 day
+notice period, unless if within such 60 day period You withdraw Your claim
+with respect to the Participant Software against such Participant either
+unilaterally or pursuant to a written agreement with Participant. 6.3. If You
+assert a patent infringement claim against Participant alleging that the
+Participant Software directly or indirectly infringes any patent where such
+claim is resolved (such as by license or settlement) prior to the initiation
+of patent infringement litigation, then the reasonable value of the licenses
+granted by such Participant under Sections 2.1 or 2.2 shall be taken into
+account in determining the amount or value of any payment or license. 6.4. In
+the event of termination under Sections 6.1 or 6.2 above, all end user
+licenses that have been validly granted by You or any distributor hereunder
+prior to termination (excluding licenses granted to You by any distributor)
+shall survive termination. 7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
+OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF
+ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL,
+INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
+MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH
+PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS
+LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
+LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND
+LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a “commercial item,” as that term is defined in 48
+C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” (as
+that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and “commercial
+computer software documentation” as such terms are used in 48 C.F.R. 12.212
+(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered
+Software with only those rights set forth herein. This U.S. Government Rights
+clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or
+provision that addresses Government rights in computer software under this
+License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject matter
+hereof. If any provision of this License is held to be unenforceable, such
+provision shall be reformed only to the extent necessary to make it
+enforceable. This License shall be governed by the law of the jurisdiction
+specified in a notice contained within the Original Software (except to the
+extent applicable law, if any, provides otherwise), excluding such
+jurisdiction's conflict-of-law provisions. Any litigation relating to this
+License shall be subject to the jurisdiction of the courts located in the
+jurisdiction and venue specified in a notice contained within the Original
+Software, with the losing party responsible for costs, including, without
+limitation, court costs and reasonable attorneys' fees and expenses. The
+application of the United Nations Convention on Contracts for the
+International Sale of Goods is expressly excluded. Any law or regulation which
+provides that the language of a contract shall be construed against the
+drafter shall not apply to this License. You agree that You alone are
+responsible for compliance with the United States export administration
+regulations (and the export control laws and regulation of any other
+countries) when You use, distribute or otherwise make available any Covered
+Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is responsible
+for claims and damages arising, directly or indirectly, out of its utilization
+of rights under this License and You agree to work with Initial Developer and
+Contributors to distribute such responsibility on an equitable basis. Nothing
+herein is intended or shall be deemed to constitute any admission of
+liability.
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+LICENSE (CDDL)
+
+The code released under the CDDL shall be governed by the laws of the State of
+California (excluding conflict-of-law provisions). Any litigation relating to
+this License shall be subject to the jurisdiction of the Federal Courts of the
+Northern District of California and the state courts of the State of
+California, with venue lying in Santa Clara County, California.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f5bf31f5/usage/dist/src/main/license/NOTICE
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/license/NOTICE b/usage/dist/src/main/license/NOTICE
new file mode 100644
index 0000000..f790f13
--- /dev/null
+++ b/usage/dist/src/main/license/NOTICE
@@ -0,0 +1,5 @@
+Apache Brooklyn
+Copyright 2014-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).


[18/19] incubator-brooklyn git commit: This closes #602

Posted by he...@apache.org.
This closes #602


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

Branch: refs/heads/master
Commit: 4f7778b8e38ccecd729d9d5be26357b6bac7824a
Parents: b52184e aab6a76
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Apr 21 21:48:35 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Apr 21 21:48:35 2015 +0100

----------------------------------------------------------------------
 docs/guide/dev/code/licensing.md                |  116 ++
 docs/guide/dev/index.md                         |    1 +
 pom.xml                                         |   26 +-
 usage/all/pom.xml                               |   46 +-
 usage/all/start-mgmt-web.sh                     |   43 -
 usage/cli/pom.xml                               |   40 +-
 usage/cli/src/main/license/DISCLAIMER           |    8 +
 usage/cli/src/main/license/LICENSE              |  208 +++
 usage/cli/src/main/license/NOTICE               |    5 +
 usage/cli/src/test/license/DISCLAIMER           |    8 +
 usage/cli/src/test/license/LICENSE              |  175 ++
 usage/cli/src/test/license/NOTICE               |    5 +
 .../main/config/build-distribution-archive.xml  |    9 +-
 .../src/main/config/build-distribution-dir.xml  |    9 +-
 usage/dist/src/main/license/DISCLAIMER          |    8 +
 usage/dist/src/main/license/LICENSE             | 1691 ++++++++++++++++++
 usage/dist/src/main/license/NOTICE              |    5 +
 usage/jsgui/pom.xml                             |   33 +
 usage/jsgui/src/main/license/DISCLAIMER         |    8 +
 usage/jsgui/src/main/license/LICENSE            |  292 +++
 usage/jsgui/src/main/license/NOTICE             |    5 +
 usage/jsgui/src/main/webapp/LICENSE             |  176 --
 usage/jsgui/src/test/license/DISCLAIMER         |    8 +
 usage/jsgui/src/test/license/LICENSE            |  175 ++
 usage/jsgui/src/test/license/NOTICE             |    5 +
 utils/jmx/jmxmp-ssl-agent/pom.xml               |   51 +-
 .../src/main/license/DISCLAIMER.shaded          |    8 +
 .../src/main/license/LICENSE.shaded             |  925 ++++++++++
 .../src/main/license/NOTICE.shaded              |   15 +
 29 files changed, 3817 insertions(+), 287 deletions(-)
----------------------------------------------------------------------