Skip to content
Permalink
Browse files
Merge branch 'master' into docker
  • Loading branch information
ahgittin committed Feb 14, 2017
2 parents 5346fbb + b6870d8 commit 214f96e7e6881c86fd2a2056d97803dc55aec285
Showing 61 changed files with 2,410 additions and 142 deletions.
@@ -0,0 +1 @@
-Xmx1024m -Xms512m -XX:MaxPermSize=256m
21 LICENSE
@@ -235,10 +235,15 @@ This project includes the software: Font Awesome (fonts)
Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
Copyright (c) Dave Gandy (2016)

This project includes the software: github.com/codegangsta/cli
Available at: https://github.com/codegangsta/cli
This project includes the software: github.com/NodePrime/jsonpath/cli/jsonpath
Available at: github.com/NodePrime/jsonpath/
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (C) 2013 Jeremy Saenz
Copyright (c) 2015 NodePrime Inc.

This project includes the software: github.com/urfave/cli
Available at: https://github.com/urfave/cli
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) 2016 Jeremy Saenz & Contributors

This project includes the software: golang.org/x/crypto/ssh
Available at: https://godoc.org/golang.org/x/crypto/ssh
@@ -273,6 +278,14 @@ This project includes the software: jQuery BBQ: Back Button & Query Library
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) "Cowboy" Ben Alman (2010)"

This project includes the software: jQuery hashchange event
Available at: http://benalman.com/projects/jquery-hashchange-plugin/
Developed by: "Cowboy" Ben Alman (http://benalman.com/)
Inclusive of: jquery.ba-bbq*.js
Version used: 1.2
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) "Cowboy" Ben Alman (2010)"

This project includes the software: DataTables Table plug-in for jQuery
Available at: http://www.datatables.net/
Developed by: SpryMedia Ltd (http://sprymedia.co.uk/)
@@ -283,7 +296,7 @@ This project includes the software: DataTables Table plug-in for jQuery

This project includes the software: jquery.easy-autocomplete.js
Available at: https://github.com/pawelczak/EasyAutocomplete
Version used: 1.3.1
Version used: 1.3.3
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Łukasz Pawełczak (2015)

@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-root</artifactId>
<version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -32,7 +32,7 @@ To test a build:

pushd /tmp
rm -rf brooklyn-sample
export BV=0.10.0-SNAPSHOT # BROOKLYN_VERSION
export BV=0.11.0-SNAPSHOT # BROOKLYN_VERSION

mvn archetype:generate \
\
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
<version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../../brooklyn-server/parent/pom.xml</relativePath>
</parent>

@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-downstream-parent</artifactId>
<version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
</parent>

<groupId>com.acme.sample</groupId>
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-root</artifactId>
<version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -1,2 +1,3 @@
LICENSE.autogenerated
notices.autogenerated
extras-files
@@ -2,12 +2,27 @@
We use a special maven plugin and scripts to automatically create the LICENSE
files, including all notices, based on metadata in overrides.yaml and **/source-inclusions.yaml.

First install https://github.com/ahgittin/license-audit-maven-plugin
and then, in the usage/dist/ project of Brooklyn...
First install https://github.com/ahgittin/license-audit-maven-plugin


# Update license information

**TODO**: Need to re-work the script for the first Karaf-based release.

* Check if new projects are added to `brooklyn-client/cli/glide.yaml`; compare to and update `/brooklyn-client/cli/release/license/source-inclusions.yaml` && `overrides.yaml`
* Check for new/updated projects in UI (in `src/main/webapp/assets/js/libs`, `src/main/webapp/assets/css`); compare to and update `brooklyn-jsgui/src/main/license/source-inclusions.yaml` && `overrides.yaml`
* Check for newly introduced non-jar dependencies, add create corresponding `source-inclusions.yaml`. For example `brooklyn-server/server-cli/src/main/license/source-inclusions.yaml`.

In the `brooklyn-dist/dist/licensing` folder execute:

./make-all-licenses.sh || ( echo 'FAILED!!!' && rm LICENSE.autogenerated )

Cross check with running `mvn project-info-reports:dependencies` and checking the output at `target/site/dependencies.html`

# Quick Usage

In the usage/dist/ project of Brooklyn...

To see a tree of license info:

mvn org.heneveld.maven:license-audit-maven-plugin:report \

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -101,13 +101,21 @@

# used in brooklyn-client (Go project)

- id: github.com/codegangsta/cli
url: https://github.com/codegangsta/cli
name: github.com/codegangsta/cli
description: A small package for building command line apps in Go
- id: github.com/urfave/cli
url: https://github.com/urfave/cli
name: github.com/urfave/cli
description: A simple, fast, and fun package for building command line apps in Go
license: MIT
notices:
- Copyright (C) 2013 Jeremy Saenz
- Copyright (c) 2016 Jeremy Saenz & Contributors

- id: github.com/NodePrime/jsonpath/cli/jsonpath
url: github.com/NodePrime/jsonpath/
name: github.com/NodePrime/jsonpath/cli/jsonpath
description: OpenSource JSON-Path
license: MIT
notices:
- Copyright (c) 2015 NodePrime Inc.

- id: golang.org/x/crypto/ssh
url: https://godoc.org/golang.org/x/crypto/ssh
@@ -168,7 +176,7 @@
# not used anymore? swagger-ui includes what it needs, it seems.
- id: swagger:2.1.6
name: Swagger JS
files: swagger-client.js
files: swagger-client.js swagger.css
version: 2.1.6
url: https://github.com/swagger-api/swagger-js
license: ASL2
@@ -259,7 +267,7 @@
license: MIT

- id: jquery.easy-autocomplete.js
version: 1.3.1
version: 1.3.3
url: https://github.com/pawelczak/EasyAutocomplete
notice: Copyright (c) Łukasz Pawełczak (2015)
license: MIT
@@ -322,6 +330,15 @@
notice: Copyright (c) "Cowboy" Ben Alman (2010)"
license: MIT

- id: jquery.ba-bbq.js-hashchange
name: "jQuery hashchange event"
files: jquery.ba-bbq*.js
version: 1.2
url: http://benalman.com/projects/jquery-hashchange-plugin/
organization: { name: "\"Cowboy\" Ben Alman", url: "http://benalman.com/" }
notice: Copyright (c) "Cowboy" Ben Alman (2010)"
license: MIT

- id: moment.js
version: 2.1.0
url: http://momentjs.com
@@ -7,5 +7,5 @@
../../brooklyn-server/server-cli

# client has "go" structure so license in a different place
../../brooklyn-client release/license
../../brooklyn-client/cli release/license

@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-root</artifactId>
<version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -46,6 +46,9 @@ export INITIAL_CLASSPATH
# TODO should be changed in code
JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 ${JAVA_OPTS}"

# Increase garbage collection, see https://issues.apache.org/jira/browse/BROOKLYN-375
JAVA_OPTS="-XX:SoftRefLRUPolicyMSPerMB=1 ${JAVA_OPTS}"

# start Brooklyn
echo $$ > "$ROOT/pid_java"
if [[ -n "$JAVA_HOME" && -d "$JAVA_HOME" ]] ; then
@@ -75,6 +75,7 @@ IF NOT "%BROOKLYN_CLASSPATH%"=="" SET "INITIAL_CLASSPATH=%BROOKLYN_CLASSPATH%;%I
REM force resolution of localhost to be loopback, otherwise we hit problems
REM TODO should be changed in code
SET JAVA_OPTS=-Dbrooklyn.location.localhost.address=127.0.0.1 %JAVA_OPTS%
SET JAVA_OPTS=-XX:SoftRefLRUPolicyMSPerMB=1 %JAVA_OPTS%

REM workaround for http://bugs.sun.com/view_bug.do?bug_id=4787931
SET JAVA_OPTS=-Duser.home="%USERPROFILE%" %JAVA_OPTS%

0 comments on commit 214f96e

Please sign in to comment.