Toggle navigation
Toggle navigation
This project
Loading...
Sign in
홍길동
/
onos
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
Yuta HIGUCHI
2014-11-03 18:02:25 -0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f2548cbac2ba8abedecc44db563e473a369aae8f
f2548cba
1 parent
195cb389
switch to Java 8
Change-Id: Iaf2b47ce7cfad7fcd5b57c8ec79e0d3e6e66ca73
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
pom.xml
tools/package/bin/onos-service
tools/package/debian/onos.conf
utils/junit/src/test/java/org/onlab/junit/TestUtilsTest.java
pom.xml
View file @
f2548cb
...
...
@@ -361,8 +361,8 @@
<!-- https://jira.codehaus.org/browse/MCOMPILER-205 -->
<version>
2.5.1
</version>
<configuration>
<source>
1.
7
</source>
<target>
1.
7
</target>
<source>
1.
8
</source>
<target>
1.
8
</target>
</configuration>
</plugin>
...
...
@@ -407,7 +407,7 @@
<plugin>
<groupId>
org.apache.felix
</groupId>
<artifactId>
maven-scr-plugin
</artifactId>
<version>
1.
15
.0
</version>
<version>
1.
20
.0
</version>
<executions>
<execution>
<id>
generate-scr-srcdescriptor
</id>
...
...
tools/package/bin/onos-service
View file @
f2548cb
...
...
@@ -3,7 +3,7 @@
# Starts ONOS Apache Karaf container
# -----------------------------------------------------------------------------
export
JAVA_HOME
=
${
JAVA_HOME
:-
/usr/lib/jvm/java-7-openjdk-amd64/
}
#
export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk-amd64/}
export
JAVA_OPTS
=
"
${
JAVA_OPTS
:-
-Xms256M -Xmx2048M
}
"
cd
/opt/onos
...
...
tools/package/debian/onos.conf
View file @
f2548cb
...
...
@@ -11,8 +11,8 @@ kill timeout 60
respawn
env
LANG
=
en_US
.
UTF
-
8
env
JAVA_HOME
=/
usr
/
lib
/
jvm
/
java
-
7
-
openjdk
-
amd64
env
NEW_JAVA_HOME
=/
usr
/
lib
/
jvm
/
java
-
8
-
oracle
/
#
env JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
#
env NEW_JAVA_HOME=/usr/lib/jvm/java-8-oracle/
pre
-
stop
script
/
opt
/
onos
/
bin
/
onos
halt
2
>/
opt
/
onos
/
var
/
stderr
.
log
...
...
utils/junit/src/test/java/org/onlab/junit/TestUtilsTest.java
View file @
f2548cb
...
...
@@ -101,9 +101,9 @@ public class TestUtilsTest {
@Test
public
void
testSetGetPrivateField
()
throws
TestUtilsException
{
assertEquals
(
42
,
TestUtils
.
getField
(
test
,
"privateField"
));
assertEquals
(
42
,
(
int
)
TestUtils
.
getField
(
test
,
"privateField"
));
TestUtils
.
setField
(
test
,
"privateField"
,
0xDEAD
);
assertEquals
(
0xDEAD
,
TestUtils
.
getField
(
test
,
"privateField"
));
assertEquals
(
0xDEAD
,
(
int
)
TestUtils
.
getField
(
test
,
"privateField"
));
}
/**
...
...
@@ -114,9 +114,9 @@ public class TestUtilsTest {
@Test
public
void
testSetGetProtectedField
()
throws
TestUtilsException
{
assertEquals
(
2501
,
TestUtils
.
getField
(
test
,
"protectedField"
));
assertEquals
(
2501
,
(
int
)
TestUtils
.
getField
(
test
,
"protectedField"
));
TestUtils
.
setField
(
test
,
"protectedField"
,
0xBEEF
);
assertEquals
(
0xBEEF
,
TestUtils
.
getField
(
test
,
"protectedField"
));
assertEquals
(
0xBEEF
,
(
int
)
TestUtils
.
getField
(
test
,
"protectedField"
));
}
/**
...
...
Please
register
or
login
to post a comment