brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [44/50] [abbrv] brooklyn-client git commit: Add further updates around build process and licensing.
Date Tue, 08 Mar 2016 13:20:17 GMT
Add further updates around build process and licensing.

Adds notice files for included dependencies.

Updates the build so that the project is at once:
1. A normal Go project that gets cloned with Go into a GOPATH structure to build.
2. A normal Maven project that can be cloned in any workspace at an arbitrary location to
build with Maven.

Adds further detail to README to explain the changes.

Adds source-inclusions.yaml file for convenience of inclusion in the higher level apache/brooklyn
build.


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

Branch: refs/heads/master
Commit: 15a7c5aee8230093ddaa559fc0745036b095a749
Parents: 2614d4d 4fe9385
Author: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Authored: Tue Mar 1 09:59:15 2016 +0000
Committer: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Committed: Tue Mar 1 09:59:15 2016 +0000

----------------------------------------------------------------------
 LICENSE                                         | 378 +++++++++----------
 README                                          | 128 +++++++
 README.md                                       | 145 +++----
 .../cli/autocomplete/bash_autocomplete          |  14 -
 .../cli/autocomplete/zsh_autocomplete           |   5 -
 build.xml                                       |  24 +-
 pom.xml                                         |   9 +-
 release/build.sh                                |  90 +++--
 src/main/assembly/bin.xml                       |  11 +-
 src/main/license/files/NOTICE-codegangsta       |   5 +
 src/main/license/files/NOTICE-x-crypto-ssh      |   5 +
 src/main/license/source-inclusions.yaml         |  24 ++
 12 files changed, 476 insertions(+), 362 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/15a7c5ae/LICENSE
----------------------------------------------------------------------
diff --cc LICENSE
index 5c304d1,eccbc6a..236947c
--- a/LICENSE
+++ b/LICENSE
@@@ -1,201 -1,177 +1,177 @@@
- Apache License
-                            Version 2.0, January 2004
-                         http://www.apache.org/licenses/
- 
-    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- 
-    1. Definitions.
- 
-       "License" shall mean the terms and conditions for use, reproduction,
-       and distribution as defined by Sections 1 through 9 of this document.
- 
-       "Licensor" shall mean the copyright owner or entity authorized by
-       the copyright owner that is granting the License.
- 
-       "Legal Entity" shall mean the union of the acting entity and all
-       other entities that control, are controlled by, or are under common
-       control with that entity. For the purposes of this definition,
-       "control" means (i) the power, direct or indirect, to cause the
-       direction or management of such entity, whether by contract or
-       otherwise, or (ii) ownership of fifty percent (50%) or more of the
-       outstanding shares, or (iii) beneficial ownership of such entity.
- 
-       "You" (or "Your") shall mean an individual or Legal Entity
-       exercising permissions granted by this License.
- 
-       "Source" form shall mean the preferred form for making modifications,
-       including but not limited to software source code, documentation
-       source, and configuration files.
- 
-       "Object" form shall mean any form resulting from mechanical
-       transformation or translation of a Source form, including but
-       not limited to compiled object code, generated documentation,
-       and conversions to other media types.
- 
-       "Work" shall mean the work of authorship, whether in Source or
-       Object form, made available under the License, as indicated by a
-       copyright notice that is included in or attached to the work
-       (an example is provided in the Appendix below).
- 
-       "Derivative Works" shall mean any work, whether in Source or Object
-       form, that is based on (or derived from) the Work and for which the
-       editorial revisions, annotations, elaborations, or other modifications
-       represent, as a whole, an original work of authorship. For the purposes
-       of this License, Derivative Works shall not include works that remain
-       separable from, or merely link (or bind by name) to the interfaces of,
-       the Work and Derivative Works thereof.
- 
-       "Contribution" shall mean any work of authorship, including
-       the original version of the Work and any modifications or additions
-       to that Work or Derivative Works thereof, that is intentionally
-       submitted to Licensor for inclusion in the Work by the copyright owner
-       or by an individual or Legal Entity authorized to submit on behalf of
-       the copyright owner. For the purposes of this definition, "submitted"
-       means any form of electronic, verbal, or written communication sent
-       to the Licensor or its representatives, including but not limited to
-       communication on electronic mailing lists, source code control systems,
-       and issue tracking systems that are managed by, or on behalf of, the
-       Licensor for the purpose of discussing and improving the Work, but
-       excluding communication that is conspicuously marked or otherwise
-       designated in writing by the copyright owner as "Not a Contribution."
- 
-       "Contributor" shall mean Licensor and any individual or Legal Entity
-       on behalf of whom a Contribution has been received by Licensor and
-       subsequently incorporated within the Work.
- 
-    2. Grant of Copyright License. Subject to the terms and conditions of
-       this License, each Contributor hereby grants to You a perpetual,
-       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-       copyright license to reproduce, prepare Derivative Works of,
-       publicly display, publicly perform, sublicense, and distribute the
-       Work and such Derivative Works in Source or Object form.
- 
-    3. Grant of Patent License. Subject to the terms and conditions of
-       this License, each Contributor hereby grants to You a perpetual,
-       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-       (except as stated in this section) patent license to make, have made,
-       use, offer to sell, sell, import, and otherwise transfer the Work,
-       where such license applies only to those patent claims licensable
-       by such Contributor that are necessarily infringed by their
-       Contribution(s) alone or by combination of their Contribution(s)
-       with the Work to which such Contribution(s) was submitted. If You
-       institute patent litigation against any entity (including a
-       cross-claim or counterclaim in a lawsuit) alleging that the Work
-       or a Contribution incorporated within the Work constitutes direct
-       or contributory patent infringement, then any patent licenses
-       granted to You under this License for that Work shall terminate
-       as of the date such litigation is filed.
- 
-    4. Redistribution. You may reproduce and distribute copies of the
-       Work or Derivative Works thereof in any medium, with or without
-       modifications, and in Source or Object form, provided that You
-       meet the following conditions:
- 
-       (a) You must give any other recipients of the Work or
-           Derivative Works a copy of this License; and
- 
-       (b) You must cause any modified files to carry prominent notices
-           stating that You changed the files; and
- 
-       (c) You must retain, in the Source form of any Derivative Works
-           that You distribute, all copyright, patent, trademark, and
-           attribution notices from the Source form of the Work,
-           excluding those notices that do not pertain to any part of
-           the Derivative Works; and
- 
-       (d) If the Work includes a "NOTICE" text file as part of its
-           distribution, then any Derivative Works that You distribute must
-           include a readable copy of the attribution notices contained
-           within such NOTICE file, excluding those notices that do not
-           pertain to any part of the Derivative Works, in at least one
-           of the following places: within a NOTICE text file distributed
-           as part of the Derivative Works; within the Source form or
-           documentation, if provided along with the Derivative Works; or,
-           within a display generated by the Derivative Works, if and
-           wherever such third-party notices normally appear. The contents
-           of the NOTICE file are for informational purposes only and
-           do not modify the License. You may add Your own attribution
-           notices within Derivative Works that You distribute, alongside
-           or as an addendum to the NOTICE text from the Work, provided
-           that such additional attribution notices cannot be construed
-           as modifying the License.
- 
-       You may add Your own copyright statement to Your modifications and
-       may provide additional or different license terms and conditions
-       for use, reproduction, or distribution of Your modifications, or
-       for any such Derivative Works as a whole, provided Your use,
-       reproduction, and distribution of the Work otherwise complies with
-       the conditions stated in this License.
- 
-    5. Submission of Contributions. Unless You explicitly state otherwise,
-       any Contribution intentionally submitted for inclusion in the Work
-       by You to the Licensor shall be under the terms and conditions of
-       this License, without any additional terms or conditions.
-       Notwithstanding the above, nothing herein shall supersede or modify
-       the terms of any separate license agreement you may have executed
-       with Licensor regarding such Contributions.
- 
-    6. Trademarks. This License does not grant permission to use the trade
-       names, trademarks, service marks, or product names of the Licensor,
-       except as required for reasonable and customary use in describing the
-       origin of the Work and reproducing the content of the NOTICE file.
- 
-    7. Disclaimer of Warranty. Unless required by applicable law or
-       agreed to in writing, Licensor provides the Work (and each
-       Contributor provides its Contributions) on an "AS IS" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-       implied, including, without limitation, any warranties or conditions
-       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-       PARTICULAR PURPOSE. You are solely responsible for determining the
-       appropriateness of using or redistributing the Work and assume any
-       risks associated with Your exercise of permissions under this License.
- 
-    8. Limitation of Liability. In no event and under no legal theory,
-       whether in tort (including negligence), contract, or otherwise,
-       unless required by applicable law (such as deliberate and grossly
-       negligent acts) or agreed to in writing, shall any Contributor be
-       liable to You for damages, including any direct, indirect, special,
-       incidental, or consequential damages of any character arising as a
-       result of this License or out of the use or inability to use the
-       Work (including but not limited to damages for loss of goodwill,
-       work stoppage, computer failure or malfunction, or any and all
-       other commercial damages or losses), even if such Contributor
-       has been advised of the possibility of such damages.
- 
-    9. Accepting Warranty or Additional Liability. While redistributing
-       the Work or Derivative Works thereof, You may choose to offer,
-       and charge a fee for, acceptance of support, warranty, indemnity,
-       or other liability obligations and/or rights consistent with this
-       License. However, in accepting such obligations, You may act only
-       on Your own behalf and on Your sole responsibility, not on behalf
-       of any other Contributor, and only if You agree to indemnify,
-       defend, and hold each Contributor harmless for any liability
-       incurred by, or claims asserted against, such Contributor by reason
-       of your accepting any such warranty or additional liability.
- 
-    END OF TERMS AND CONDITIONS
- 
-    APPENDIX: How to apply the Apache License to your work.
- 
-       To apply the Apache License to your work, attach the following
-       boilerplate notice, with the fields enclosed by brackets "{}"
-       replaced with your own identifying information. (Don't include
-       the brackets!)  The text should be enclosed in the appropriate
-       comment syntax for the file format. We also recommend that a
-       file or class name and description of purpose be included on the
-       same "printed page" as the copyright notice for easier
-       identification within third-party archives.
- 
-    Copyright {yyyy} {name of copyright owner}
- 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
- 
-        http://www.apache.org/licenses/LICENSE-2.0
- 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+ Apache License, Version 2.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/brooklyn-client/blob/15a7c5ae/README.md
----------------------------------------------------------------------
diff --cc README.md
index 78c809e,e8b6077..c00e960
--- a/README.md
+++ b/README.md
@@@ -13,17 -15,24 +15,25 @@@ You will need the following tools to bu
  - godep (see https://github.com/tools/godep)
  
  Optional:
 +- Maven (used by the Brooklyn build process)
  
+ - Maven (see note below on the Brooklyn build process)
+ 
  
- ## Build Pre-Requisites
+ ## Workspace Setup
+ 
+ Go is very particular about the layout of a source tree, and the naming of packages.  It
is therefore important to 
+ get the code from github.com/apache/brooklyn-client and not your own fork. If you want to
contribute to the 
+ project, the procedure to follow is still to get the code from github.com/apache/brooklyn-client,
and then to add your
+ own fork as a remote. 
  
  - Ensure your [$GOPATH](http://golang.org/cmd/go/#hdr-GOPATH_environment_variable) is set
correctly 
-   to a suitable location for your Go code.
- - Install Brooklyn CLI and dependencies (note the "-d" parameter, which instructs Go to
download the files but not
-   build the code).  
+   to a suitable location for your Go code, for example, simply $HOME/go.
+ - Get the Brooklyn CLI and dependencies. Note the "-d" parameter, which instructs Go to
download the files but not
+   build the code, see why in the note below on dependency management.
+ 
  `go get -d github.com/apache/brooklyn-client/br`  
-     
+ 
      
  ## A note on dependency management
  
@@@ -75,91 -116,5 +117,22 @@@ consisting of a zip file containing al
  
  ## Running
  
- Ensure your path contains $GOPATH/bin.
- 
- First, log in to your Brooklyn instance with:
- 
-     $ br login URL [USER PASSWORD]
- 
- See the help command for info on all commands:
- 
-     $ br help
- 
- And for help on individual commands:
- 
-     $ br help COMMAND
- 
- 
- ## Scopes
-    Many commands require a "scope" expression to indicate the target on which they operate.
The scope expressions are
-    as follows (values in brackets are aliases for the scope):
-    - application APP-ID   (app, a)  
-      Selects an application, e.g. "br app myapp"
-    - entity      ENT-ID   (ent, e)  
-      Selects an entity within an application scope, e.g. "br app myapp ent myserver"
-    - effector    EFF-ID   (eff, f)  
-      Selects an effector of an entity or application, e.g. "br a myapp e myserver eff xyz"
-    - config      CONF-KEY (conf, con, c)  
-      Selects a configuration key of an entity e.g. "br a myapp e myserver config jmx.agent.mode"
-    - activity    ACT-ID   (act, v)  
-      Selects an activity of an entity e.g. "br a myapp e myserver act iHG7sq1"
- 
- 
- ## Commands
- 
-    Commands whose description begins with a "*" character are particularly experimental
and likely to change in upcoming
-    releases.  If not otherwise specified, "SCOPE" below means application or entity scope.
 If an entity scope is not
-    specified, the application entity is used as a default.
- 
-    - *access*         Show access control
-    - *activity*       Show the activity for an application / entity
-    - *add-catalog*    * Add a new catalog item from the supplied YAML
-    - *add-children*   * Add a child or children to this entity from the supplied YAML
-    - *application*    Show the status and location of running applications
-    - *catalog*        * List the available catalog applications
-    - *config*         Show the config for an application or entity
-    - *delete*         * Delete (expunge) a brooklyn application
-    - *deploy*         Deploy a new brooklyn application from the supplied YAML
-    - *destroy-policy* Destroy a policy
-    - *effector*       Show the effectors for an application or entity
-    - *entity*         Show the entities of an application or entity
-    - *env*            Show the ENV stream for a given activity
-    - *invoke*         Invoke an effector of an application and entity
-    - *locations*      * List the available locations
-    - *login*          Login to brooklyn
-    - *policies*       Show the list of policies for an application and entity
-    - *policy*         Show the status of a policy for an application and entity
-    - *rename*         Rename an application or entity
-    - *restart*        Invoke restart effector on an application and entity
-    - *sensor*         Show values of all sensors or named sensor for an application or entity
-    - *set*            Set config for an entity
-    - *spec*           Get the YAML spec used to create the entity, if available
-    - *start*          Invoke start effector on an application and entity
-    - *start-policy*   Start or resume a policy
-    - *stderr*         Show the STDERR stream for a given activity
-    - *stdin*          Show the STDIN stream for a given activity
-    - *stdout*         Show the STDOUT stream for a given activity
-    - *stop*           Invoke stop effector on an application and entity
-    - *stop-policy*    Suspends a policy
-    - *tree*           * Show the tree of all applications
-    - *version*        Display the version of the connected Brooklyn
-    - *help*    
- 
+ See instructions in the included [Runtime README](README) file.
  
 +----
 +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.

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/15a7c5ae/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/15a7c5ae/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index e45b4f5,03b875a..ec34675
--- a/pom.xml
+++ b/pom.xml
@@@ -80,34 -78,18 +79,28 @@@
                      <descriptors>
                          <descriptor>src/main/assembly/bin.xml</descriptor>
                      </descriptors>
 -                </configuration>
 -                <executions>
 -                    <execution>
 -                        <id>make-assembly</id>
 -                        <phase>package</phase>
 -                        <goals>
 -                            <goal>single</goal>
 -                        </goals>
 -                    </execution>
 -                </executions>
 +                </configuration><executions>
 +                <execution>
 +                    <id>make-assembly</id>
 +                    <phase>package</phase>
 +                    <goals>
 +                        <goal>single</goal>
 +                    </goals>
 +                </execution>
 +            </executions>
 +            </plugin>
  
 +            <plugin>
 +                <groupId>org.apache.rat</groupId>
 +                <artifactId>apache-rat-plugin</artifactId>
 +                <version>0.11</version>
 +                <configuration>
 +                    <excludes combine.children="append">
-                         <!--
-                             The maven archetype are files "without any degree of creativity".
They are intended
-                             purely as a template to generate a new project for a user, where
upon the user can
-                             write their code within this new project.
-                             The exclusions seem to need to include code that is auto-generated
during a test run.
-                         -->
 +                        <exclude>**/br/Godeps/**/*</exclude>
 +                    </excludes>
 +                </configuration>
              </plugin>
 +
          </plugins>
  
      </build>

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/15a7c5ae/release/build.sh
----------------------------------------------------------------------
diff --cc release/build.sh
index fb9e187,0187bd4..1c99309
--- a/release/build.sh
+++ b/release/build.sh
@@@ -1,21 -1,12 +1,21 @@@
  #!/bin/sh
 -
 -#
 -# TODO
 +# 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
- # 
+ #
 -# Checks on availability of go coompiler
 -# Use godep for resolving dependencies
 -# Add some useful comments
 +#  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.
 +
  
  #
  # Constants
@@@ -23,8 -14,8 +23,10 @@@
  OSVALUES="darwin freebsd linux netbsd openbsd windows"
  ARCHVALUES="386 amd64"
  BRNAME="br"
 +GOPACKAGE="github.com/apache/brooklyn-client/${BRNAME}"
 +EXECUTABLE_DIR="$GOPATH/src/$GOPACKAGE"
+ PROJECT="github.com/apache/brooklyn-client"
+ CLI_PACKAGE="${PROJECT}/${BRNAME}"
  GOBIN=go
  GODEP=godep
  

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/15a7c5ae/src/main/assembly/bin.xml
----------------------------------------------------------------------


Mime
View raw message