홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ayaka Koshibe
1c6e94f2 2 parents 15f4d60a 9c7af629

Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

Inline Side-by-side
Showing 4 changed files with 7 additions and 5 deletions
...@@ -5,7 +5,7 @@ export ONOS_ROOT=${ONOS_ROOT:-~/onos-next} ...@@ -5,7 +5,7 @@ export ONOS_ROOT=${ONOS_ROOT:-~/onos-next}
5 5
6 # M2 repository and Karaf gold bits 6 # M2 repository and Karaf gold bits
7 export M2_REPO=${M2_REPO:-~/.m2/repository} 7 export M2_REPO=${M2_REPO:-~/.m2/repository}
8 -export KARAF_VERSION=${KARAF_VERSION:-3.0.1} 8 +export KARAF_VERSION=${KARAF_VERSION:-3.0.2}
9 export KARAF_ZIP=${KARAF_ZIP:-~/Downloads/apache-karaf-$KARAF_VERSION.zip} 9 export KARAF_ZIP=${KARAF_ZIP:-~/Downloads/apache-karaf-$KARAF_VERSION.zip}
10 export KARAF_TAR=${KARAF_TAR:-~/Downloads/apache-karaf-$KARAF_VERSION.tar.gz} 10 export KARAF_TAR=${KARAF_TAR:-~/Downloads/apache-karaf-$KARAF_VERSION.tar.gz}
11 export KARAF_DIST=$(basename $KARAF_ZIP .zip) 11 export KARAF_DIST=$(basename $KARAF_ZIP .zip)
......
...@@ -8,7 +8,9 @@ export ONOS_ROOT=${ONOS_ROOT:-~/onos-next} ...@@ -8,7 +8,9 @@ export ONOS_ROOT=${ONOS_ROOT:-~/onos-next}
8 # Setup some environmental context for developers 8 # Setup some environmental context for developers
9 if [ -z "${JAVA_HOME}" ]; then 9 if [ -z "${JAVA_HOME}" ]; then
10 if [ -x /usr/libexec/java_home ]; then 10 if [ -x /usr/libexec/java_home ]; then
11 - export JAVA_HOME=$(/usr/libexec/java_home -v 1.7) 11 + export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)
12 + elif [ -d /usr/lib/jvm/java-8-oracle ]; then
13 + export JAVA_HOME="/usr/lib/jvm/java-8-oracle"
12 elif [ -d /usr/lib/jvm/java-7-openjdk-amd64 ]; then 14 elif [ -d /usr/lib/jvm/java-7-openjdk-amd64 ]; then
13 export JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64" 15 export JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64"
14 fi 16 fi
...@@ -16,7 +18,7 @@ fi ...@@ -16,7 +18,7 @@ fi
16 18
17 export MAVEN=${MAVEN:-~/Applications/apache-maven-3.2.2} 19 export MAVEN=${MAVEN:-~/Applications/apache-maven-3.2.2}
18 20
19 -export KARAF_VERSION=${KARAF_VERSION:-3.0.1} 21 +export KARAF_VERSION=${KARAF_VERSION:-3.0.2}
20 export KARAF=${KARAF:-~/Applications/apache-karaf-$KARAF_VERSION} 22 export KARAF=${KARAF:-~/Applications/apache-karaf-$KARAF_VERSION}
21 export KARAF_LOG=$KARAF/data/log/karaf.log 23 export KARAF_LOG=$KARAF/data/log/karaf.log
22 24
......
...@@ -6,4 +6,4 @@ export OC2="192.168.56.102" ...@@ -6,4 +6,4 @@ export OC2="192.168.56.102"
6 export OCN="192.168.56.103" 6 export OCN="192.168.56.103"
7 export OCI="${OC1}" 7 export OCI="${OC1}"
8 8
9 -export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-openflow,onos-rest,onos-app-fwd,onos-app-proxyarp,onos-app-tvue}" 9 +export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-openflow,onos-gui,onos-rest,onos-app-fwd,onos-app-proxyarp,onos-app-tvue}"
......
...@@ -7,4 +7,4 @@ export OC3="192.168.56.104" ...@@ -7,4 +7,4 @@ export OC3="192.168.56.104"
7 export OCN="192.168.56.103" 7 export OCN="192.168.56.103"
8 export OCI="${OC1}" 8 export OCI="${OC1}"
9 9
10 -export ONOS_FEATURES="" 10 +export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-openflow,onos-gui,onos-rest,onos-app-fwd,onos-app-proxyarp,onos-app-tvue}"
......