홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
4809de73 1 parent 00a406d4

Few changes to CORD GUI for integration: 

 * Make listen port configurable
 * Portability fix so stop.me works on ubuntu
 * Force compiling with Java 1.8

Change-Id: I997da28194613631ee287a8679880b313d51addd
Inline Side-by-side
Showing 3 changed files with 23 additions and 4 deletions
...@@ -88,4 +88,22 @@ ...@@ -88,4 +88,22 @@
88 </dependency> 88 </dependency>
89 </dependencies> 89 </dependencies>
90 90
91 + <build>
92 + <pluginManagement>
93 + <plugins>
94 + <plugin>
95 + <groupId>org.apache.maven.plugins</groupId>
96 + <artifactId>maven-compiler-plugin</artifactId>
97 + <!-- TODO: update once following issue is fixed. -->
98 + <!-- https://jira.codehaus.org/browse/MCOMPILER-205 -->
99 + <version>2.5.1</version>
100 + <configuration>
101 + <source>1.8</source>
102 + <target>1.8</target>
103 + </configuration>
104 + </plugin>
105 + </plugins>
106 + </pluginManagement>
107 + </build>
108 +
91 </project> 109 </project>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 # CORD Demo 2 # CORD Demo
3 # ========= 3 # =========
4 4
5 +export LISTENPORT=8080
5 export JETTY="-jar jetty-runner.jar" 6 export JETTY="-jar jetty-runner.jar"
6 export CORD=./cord-gui-1.2.0-SNAPSHOT.war 7 export CORD=./cord-gui-1.2.0-SNAPSHOT.war
7 export LOGDBG=-Dorg.onosproject.cord.gui.LEVEL=DEBUG 8 export LOGDBG=-Dorg.onosproject.cord.gui.LEVEL=DEBUG
...@@ -25,8 +26,8 @@ else ...@@ -25,8 +26,8 @@ else
25 PARAM2="" 26 PARAM2=""
26 fi 27 fi
27 28
28 -java $PARAM1 $PARAM2 $LOGDBG $JETTY $CORD >$LOG 2>&1 & 29 +java $PARAM1 $PARAM2 $LOGDBG $JETTY --port $LISTENPORT $CORD >$LOG 2>&1 &
29 -#java $PARAM1 $PARAM2 $LOGDBG $DEBUG $JETTY $CORD >$LOG 2>&1 & 30 +#java $PARAM1 $PARAM2 $LOGDBG $DEBUG $JETTY --port $LISTENPORT $CORD >$LOG 2>&1 &
30 31
31 echo jetty-runner started {$PARAM1:$PARAM2} 32 echo jetty-runner started {$PARAM1:$PARAM2}
32 echo .. logging to $LOG 33 echo .. logging to $LOG
......
1 # script to stop the cord gui server 1 # script to stop the cord gui server
2 # 2 #
3 -PID=$(ps | grep jetty-runner | grep -v grep | cut -c1-5) 3 +PID=$(ps -ef | grep jetty-runner | grep -v grep | awk '{print $2}')
4 if [ -z "$PID" ] 4 if [ -z "$PID" ]
5 then 5 then
6 echo jetty-runner not running 6 echo jetty-runner not running
...@@ -9,7 +9,7 @@ fi ...@@ -9,7 +9,7 @@ fi
9 kill $PID 9 kill $PID
10 sleep 1 10 sleep 1
11 11
12 -PID=$(ps | grep jetty-runner | grep -v grep | cut -c1-5) 12 +PID=$(ps -ef | grep jetty-runner | grep -v grep | awk '{print $2}')
13 if [ ! -z "$PID" ] 13 if [ ! -z "$PID" ]
14 then 14 then
15 echo jetty-runner still running ? 15 echo jetty-runner still running ?
......