You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/05/19 14:08:42 UTC
[1/2] brooklyn-dist git commit: Move to Java 8,
remove MaxPermSize options
Repository: brooklyn-dist
Updated Branches:
refs/heads/master 2f48a5962 -> 2337c75aa
Move to Java 8, remove MaxPermSize options
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/eb02fac7
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/eb02fac7
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/eb02fac7
Branch: refs/heads/master
Commit: eb02fac7e19c0274ecdec9f43fffb603bfeead8c
Parents: 2f48a59
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri May 19 15:57:25 2017 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri May 19 15:57:25 2017 +0300
----------------------------------------------------------------------
.mvn/jvm.config | 2 +-
dist/src/main/dist/bin/brooklyn | 2 +-
dist/src/main/dist/bin/brooklyn.bat | 2 +-
dist/src/main/dist/bin/brooklyn.ps1 | 2 +-
docker/Dockerfile | 2 --
downstream-parent/pom.xml | 2 +-
.../src/main/resources/service/systemd/brooklyn.service | 2 +-
.../src/main/resources/service/upstart/deb/brooklyn.conf | 2 +-
.../src/main/resources/service/upstart/rpm/brooklyn.conf | 2 +-
9 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/eb02fac7/.mvn/jvm.config
----------------------------------------------------------------------
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
index af5fbd1..d24b75a 100644
--- a/.mvn/jvm.config
+++ b/.mvn/jvm.config
@@ -1 +1 @@
--Xmx1024m -Xms512m -XX:MaxPermSize=256m
+-Xmx1024m -Xms512m
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/eb02fac7/dist/src/main/dist/bin/brooklyn
----------------------------------------------------------------------
diff --git a/dist/src/main/dist/bin/brooklyn b/dist/src/main/dist/bin/brooklyn
index f7e5f97..eb52790 100755
--- a/dist/src/main/dist/bin/brooklyn
+++ b/dist/src/main/dist/bin/brooklyn
@@ -31,7 +31,7 @@ export ROOT BROOKLYN_HOME
# use default memory settings, if not specified
if [ -z "${JAVA_OPTS}" ] ; then
- JAVA_OPTS="-Xms256m -Xmx1g -XX:MaxPermSize=256m"
+ JAVA_OPTS="-Xms256m -Xmx1g"
fi
# set up the classpath
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/eb02fac7/dist/src/main/dist/bin/brooklyn.bat
----------------------------------------------------------------------
diff --git a/dist/src/main/dist/bin/brooklyn.bat b/dist/src/main/dist/bin/brooklyn.bat
index 04a816d..f543369 100644
--- a/dist/src/main/dist/bin/brooklyn.bat
+++ b/dist/src/main/dist/bin/brooklyn.bat
@@ -65,7 +65,7 @@ IF NOT DEFINED JAVA_BIN (
)
REM use default memory settings, if not specified
-IF "%JAVA_OPTS%"=="" SET JAVA_OPTS=-Xms256m -Xmx500m -XX:MaxPermSize=256m
+IF "%JAVA_OPTS%"=="" SET JAVA_OPTS=-Xms256m -Xmx1g
REM set up the classpath
SET INITIAL_CLASSPATH=%BROOKLYN_HOME%conf;%BROOKLYN_HOME%lib\patch\*;%BROOKLYN_HOME%lib\brooklyn\*;%BROOKLYN_HOME%lib\dropins\*
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/eb02fac7/dist/src/main/dist/bin/brooklyn.ps1
----------------------------------------------------------------------
diff --git a/dist/src/main/dist/bin/brooklyn.ps1 b/dist/src/main/dist/bin/brooklyn.ps1
index 6780ed2..6fbd277 100644
--- a/dist/src/main/dist/bin/brooklyn.ps1
+++ b/dist/src/main/dist/bin/brooklyn.ps1
@@ -103,7 +103,7 @@ $javaargs = @()
# add the user's java opts, or use default memory settings, if not specified
if ( $env:JAVA_OPTS -eq $null ) {
- $javaargs +="-Xms256m -Xmx1g -XX:MaxPermSize=256m"
+ $javaargs +="-Xms256m -Xmx1g"
} else {
$javaargs +=$env:JAVA_OPTS
}
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/eb02fac7/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 91d3973..e7d0aa1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -28,8 +28,6 @@ WORKDIR /home/brooklyn
# now install software brooklyn
COPY target/files/ .
RUN \
- # remove option not relevan for java v8 \
- sed -i.bk "s/ -XX:MaxPermSize=256m//" bin/brooklyn ; \
# install br for global use \
cp ./bin/br /usr/bin/br ; \
# and fix perms (irritating that docker won't do this) \
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/eb02fac7/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/downstream-parent/pom.xml b/downstream-parent/pom.xml
index 709399c..6332cd6 100644
--- a/downstream-parent/pom.xml
+++ b/downstream-parent/pom.xml
@@ -313,7 +313,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=512m</argLine>
+ <argLine>-Xms256m -Xmx512m</argLine>
<properties>
<property>
<name>listener</name>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/eb02fac7/shared-packaging/src/main/resources/service/systemd/brooklyn.service
----------------------------------------------------------------------
diff --git a/shared-packaging/src/main/resources/service/systemd/brooklyn.service b/shared-packaging/src/main/resources/service/systemd/brooklyn.service
index f2e2f26..52dd3b6 100644
--- a/shared-packaging/src/main/resources/service/systemd/brooklyn.service
+++ b/shared-packaging/src/main/resources/service/systemd/brooklyn.service
@@ -22,7 +22,7 @@ Documentation=https://brooklyn.apache.org/documentation/index.html
[Service]
Type=simple
WorkingDirectory=/opt/brooklyn/
-Environment="JAVA_OPTS=-Dbrooklyn.location.localhost.address=127.0.0.1 -XX:SoftRefLRUPolicyMSPerMB=1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml -Xms256m -Xmx1g -XX:MaxPermSize=256m"
+Environment="JAVA_OPTS=-Dbrooklyn.location.localhost.address=127.0.0.1 -XX:SoftRefLRUPolicyMSPerMB=1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml -Xms256m -Xmx1g"
Environment="CLASSPATH=/opt/brooklyn/conf:/opt/brooklyn/lib/patch/*:/opt/brooklyn/lib/brooklyn/*:/opt/brooklyn/lib/dropins/*"
ExecStart=/usr/bin/java $JAVA_OPTS -cp "$CLASSPATH" org.apache.brooklyn.cli.Main launch --noGlobalBrooklynProperties --localBrooklynProperties /etc/brooklyn/brooklyn.conf --persist auto
Restart=always
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/eb02fac7/shared-packaging/src/main/resources/service/upstart/deb/brooklyn.conf
----------------------------------------------------------------------
diff --git a/shared-packaging/src/main/resources/service/upstart/deb/brooklyn.conf b/shared-packaging/src/main/resources/service/upstart/deb/brooklyn.conf
index 1fc7cdf..931fffd 100644
--- a/shared-packaging/src/main/resources/service/upstart/deb/brooklyn.conf
+++ b/shared-packaging/src/main/resources/service/upstart/deb/brooklyn.conf
@@ -34,7 +34,7 @@ end script
script
BROOKLYN_HOME="/opt/brooklyn/"
- JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 -XX:SoftRefLRUPolicyMSPerMB=1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml -Xms256m -Xmx1g -XX:MaxPermSize=256m"
+ JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 -XX:SoftRefLRUPolicyMSPerMB=1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml -Xms256m -Xmx1g"
CLASSPATH="/opt/brooklyn/conf:/opt/brooklyn/lib/patch/*:/opt/brooklyn/lib/brooklyn/*:/opt/brooklyn/lib/dropins/*"
export BROOKLYN_HOME
exec java ${JAVA_OPTS} -cp "${CLASSPATH}" org.apache.brooklyn.cli.Main launch --noGlobalBrooklynProperties --localBrooklynProperties /etc/brooklyn/brooklyn.conf --persist auto
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/eb02fac7/shared-packaging/src/main/resources/service/upstart/rpm/brooklyn.conf
----------------------------------------------------------------------
diff --git a/shared-packaging/src/main/resources/service/upstart/rpm/brooklyn.conf b/shared-packaging/src/main/resources/service/upstart/rpm/brooklyn.conf
index 7ac01de..804e0cd 100644
--- a/shared-packaging/src/main/resources/service/upstart/rpm/brooklyn.conf
+++ b/shared-packaging/src/main/resources/service/upstart/rpm/brooklyn.conf
@@ -31,7 +31,7 @@ end script
script
BROOKLYN_HOME="/opt/brooklyn/"
- JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 -XX:SoftRefLRUPolicyMSPerMB=1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml -Xms256m -Xmx1g -XX:MaxPermSize=256m"
+ JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 -XX:SoftRefLRUPolicyMSPerMB=1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml -Xms256m -Xmx1g"
CLASSPATH="/opt/brooklyn/conf:/opt/brooklyn/lib/patch/*:/opt/brooklyn/lib/brooklyn/*:/opt/brooklyn/lib/dropins/*"
export BROOKLYN_HOME
# Upstart is too old on CentOS 6, at least v1.4 required to use setuid, setgid.
[2/2] brooklyn-dist git commit: This closes #93
Posted by dr...@apache.org.
This closes #93
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/2337c75a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/2337c75a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/2337c75a
Branch: refs/heads/master
Commit: 2337c75aa8449dc19e51424db7ac29f7d1a71927
Parents: 2f48a59 eb02fac
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Fri May 19 15:08:31 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Fri May 19 15:08:31 2017 +0100
----------------------------------------------------------------------
.mvn/jvm.config | 2 +-
dist/src/main/dist/bin/brooklyn | 2 +-
dist/src/main/dist/bin/brooklyn.bat | 2 +-
dist/src/main/dist/bin/brooklyn.ps1 | 2 +-
docker/Dockerfile | 2 --
downstream-parent/pom.xml | 2 +-
.../src/main/resources/service/systemd/brooklyn.service | 2 +-
.../src/main/resources/service/upstart/deb/brooklyn.conf | 2 +-
.../src/main/resources/service/upstart/rpm/brooklyn.conf | 2 +-
9 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------