2 new revisions:
Revision: 2a5e45575516
Author: [email protected] <[email protected]>
Date: Sat Jul 7 04:40:38 2012
Log: Issue 98: rename ss7-run.sh/ss7-run.bat to ss7-cli.sh/ss7-cli.bat
http://code.google.com/p/jss7/source/detail?r=2a5e45575516
Revision: 74ff2cef9544
Author: [email protected] <[email protected]>
Date: Sat Jul 7 04:41:11 2012
Log: Merge branch 'master' of
https://[email protected]/p/jss7/
http://code.google.com/p/jss7/source/detail?r=74ff2cef9544
==============================================================================
Revision: 2a5e45575516
Author: [email protected] <[email protected]>
Date: Sat Jul 7 04:40:38 2012
Log: Issue 98: rename ss7-run.sh/ss7-run.bat to ss7-cli.sh/ss7-cli.bat
http://code.google.com/p/jss7/source/detail?r=2a5e45575516
Added:
/management/shell/src/main/config/ss7-cli.bat
/management/shell/src/main/config/ss7-cli.sh
Deleted:
/management/shell/src/main/config/ss7-run.bat
/management/shell/src/main/config/ss7-run.sh
Modified:
/management/shell/pom.xml
/management/shell/src/main/assembly/pojo.xml
=======================================
--- /dev/null
+++ /management/shell/src/main/config/ss7-cli.bat Sat Jul 7 04:40:38 2012
@@ -0,0 +1,145 @@
+@echo off
+rem
-------------------------------------------------------------------------
+rem Mobicents SS7 CLI Bootstrap Script for Win32
+rem
-------------------------------------------------------------------------
+
+rem $Id: run.bat,v 1.5 2010/12/13 10:15:40 abhayani Exp $
+
+@if not "%ECHO%" == "" echo %ECHO%
+@if "%OS%" == "Windows_NT" setlocal
+
+set DIRNAME=.\
+if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
+set PROGNAME=run.bat
+if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
+
+pushd %DIRNAME%..
+set SHELL_HOME=%CD%
+echo ========
+echo %SHELL_HOME%
+
+popd
+
+REM Add bin/native to the PATH if present
+if exist "%SHELL_HOME%\native" set PATH=%SHELL_HOME%\native;%PATH%
+if exist "%SHELL_HOME%\native" set JAVA_OPTS=%JAVA_OPTS%
-Djava.library.path="%PATH%"
+
+REM Run section - here we define node and default ip
+set IP=127.0.0.1
+
+rem Read all command line arguments
+
+REM
+REM The %ARGS% env variable commented out in favor of using %* to include
+REM all args in java command line. See bug #840239. [jpl]
+REM
+REM set ARGS=
+REM :loop
+REM if [%1] == [] goto endloop
+REM set ARGS=%ARGS% %1
+REM shift
+REM goto loop
+REM :endloop
+
+
+set ARGS=""
+
+
+:loop
+ if [%1] == [] goto endloop
+ set ARGS=%ARGS% %1
+ shift
+ goto loop
+ :endloop
+
+
+rem Find run.jar, or we can't continue
+
+set RUNJAR=%SHELL_HOME%\bin\mobicents-ss7-shell.jar
+if exist "%RUNJAR%" goto FOUND_RUN_JAR
+echo Could not locate %RUNJAR%. Please check that you are in the
+echo bin directory when running this script.
+goto END
+
+:FOUND_RUN_JAR
+
+if not "%JAVA_HOME%" == "" goto ADD_TOOLS
+
+set JAVA=java
+
+echo JAVA_HOME is not set. Unexpected results may occur.
+echo Set JAVA_HOME to the directory of your local JDK to avoid this
message.
+goto SKIP_TOOLS
+
+:ADD_TOOLS
+
+set JAVA=%JAVA_HOME%\bin\java
+
+rem A full JDK with toos.jar is not required anymore since jboss web
packages
+rem the eclipse jdt compiler and javassist has its own internal compiler.
+if not exist "%JAVA_HOME%\lib\tools.jar" goto SKIP_TOOLS
+
+rem If exists, point to the JDK javac compiler in case the user wants to
+rem later override the eclipse jdt compiler for compiling JSP pages.
+set JAVAC_JAR=%JAVA_HOME%\lib\tools.jar
+
+:SKIP_TOOLS
+
+rem If JBOSS_CLASSPATH or JAVAC_JAR is empty, don't include it, as this
will
+rem result in including the local directory in the classpath, which makes
+rem error tracking harder.
+if not "%JAVAC_JAR%" == "" set RUNJAR=%JAVAC_JAR%;%RUNJAR%
+if "%SHELL_CLASSPATH%" == "" set RUN_CLASSPATH=%RUNJAR%
+if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%SHELL_CLASSPATH%;%RUNJAR%
+
+set SHELL_CLASSPATH=%RUN_CLASSPATH%
+
+rem Setup JBoss specific properties
+set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
+
+rem Add -server to the JVM options, if supported
+"%JAVA%" -version 2>&1 | findstr /I hotspot > nul
+if not errorlevel == 1 (set JAVA_OPTS=%JAVA_OPTS% -server)
+
+rem JVM memory allocation pool parameters. Modify as appropriate.
+set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m
+
+rem profiler
+rem set JAVA_OPTS=%JAVA_OPTS%
-agentpath:C:\Users\kulikov\.netbeans\6.1\lib\deployed\jdk15\windows\profilerinterface.dll=C:\Users\kulikov\.netbeans\6.1\lib,5140
+rem set JAVA_OPTS=%JAVA_OPTS%
-agentpath:C:\Users\kulikov\.netbeans\6.1\lib\deployed\jdk16\windows\profilerinterface.dll=C:\Users\kulikov\.netbeans\6.1\lib,5140
+
+rem With Sun JVMs reduce the RMI GCs to once per hour
+set JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000
-Dsun.rmi.dgc.server.gcInterval=3600000
+
+rem JPDA options. Uncomment and modify as appropriate to enable remote
debugging.
+rem set JAVA_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y %JAVA_OPTS%
+
+rem Setup the java endorsed dirs
+set SHELL_ENDORSED_DIRS=%SHELL_HOME%\bin\lib
+
+
+echo
===============================================================================
+echo.
+echo Mobicents SS7 Management Shell Bootstrap Environment
+echo.
+echo SHELL_HOME: %SHELL_HOME%
+echo.
+echo JAVA: %JAVA%
+echo.
+echo JAVA_OPTS: %JAVA_OPTS%
+echo.
+echo CLASSPATH: %SHELL_CLASSPATH%
+echo
+echo SHELL_ENDORSED_DIRS: %SHELL_ENDORSED_DIRS%
+echo.
+echo
===============================================================================
+echo.
+
+:RESTART
+"%JAVA%" %JAVA_OPTS% -Djava.ext.dirs="%SHELL_ENDORSED_DIRS%"
-classpath "%SHELL_CLASSPATH%" org.mobicents.ss7.management.console.Shell %*
+rem if ERRORLEVEL 10 goto RESTART
+
+:END
+if "%NOPAUSE%" == "" pause
+
+:END_NO_PAUSE
=======================================
--- /dev/null
+++ /management/shell/src/main/config/ss7-cli.sh Sat Jul 7 04:40:38 2012
@@ -0,0 +1,171 @@
+#!/bin/sh
+### ======================================================================
###
+##
##
+## Mobicents SS7 CLI Bootstrap Script ##
+##
##
+### ======================================================================
###
+
+### $Id: run.sh [email protected] $ ###
+
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+GREP="grep"
+
+# Use the maximum available, or set MAX_FD != -1 to use that
+MAX_FD="maximum"
+
+#
+# Helper to complain.
+#
+warn() {
+ echo "${PROGNAME}: $*"
+}
+
+#
+# Helper to puke.
+#
+die() {
+ warn $*
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+darwin=false;
+linux=false;
+case "`uname`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+
+ Darwin*)
+ darwin=true
+ ;;
+
+ Linux)
+ linux=true
+ ;;
+esac
+
+
+# Force IPv4 on Linux systems since IPv6 doesn't work correctly with jdk5
and lower
+if [ "$linux" = "true" ]; then
+ JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$SHELL_HOME" ] &&
+ SHELL_HOME=`cygpath --unix "$SHELL_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$JAVAC_JAR" ] &&
+ JAVAC_JAR=`cygpath --unix "$JAVAC_JAR"`
+fi
+
+# Setup SHELL_HOME
+if [ "x$SHELL_HOME" = "x" ]; then
+ # get the full path (without any relative bits)
+ SHELL_HOME=`cd $DIRNAME/..; pwd`
+fi
+export SHELL_HOME
+
+# Increase the maximum file descriptors if we can
+if [ "$cygwin" = "false" ]; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ]; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
+ # use the system max
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ]; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query system maximum file descriptor limit:
$MAX_FD_LIMIT"
+ fi
+fi
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+ if [ "x$JAVA_HOME" != "x" ]; then
+ JAVA="$JAVA_HOME/bin/java"
+ else
+ JAVA="java"
+ fi
+fi
+
+# Setup the classpath
+runjar="$SHELL_HOME/lib/mobicents-ss7-shell.jar"
+if [ ! -f "$runjar" ]; then
+ die "Missing required file: $runjar"
+fi
+
+SHELL_BOOT_CLASSPATH="$runjar"
+SHELL_CLASSPATH="$SHELL_HOME/lib/*"
+
+if [ "x$SHELL_CLASSPATH" = "x" ]; then
+ SHELL_CLASSPATH="$SHELL_BOOT_CLASSPATH"
+else
+ SHELL_CLASSPATH="$SHELL_CLASSPATH:$SHELL_BOOT_CLASSPATH"
+fi
+
+
+# If -server not set in JAVA_OPTS, set it, if supported
+SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
+if [ "x$SERVER_SET" = "x" ]; then
+
+ # Check for SUN(tm) JVM w/ HotSpot support
+ if [ "x$HAS_HOTSPOT" = "x" ]; then
+ HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
+ fi
+
+ # Enable -server if we have Hotspot, unless we can't
+ if [ "x$HAS_HOTSPOT" != "x" ]; then
+ # MacOS does not support -server flag
+ if [ "$darwin" != "true" ]; then
+ JAVA_OPTS="-server $JAVA_OPTS"
+ fi
+ fi
+fi
+
+# Setup MMS specific properties
+JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"
+JAVA_OPTS="$JAVA_OPTS -Xms64m -Xmx64m
-Dsun.rmi.dgc.client.gcInterval=3600000
-Dsun.rmi.dgc.server.gcInterval=3600000"
+#JAVA_OPTS="$JAVA_OPTS
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
+# Setup the java endorsed dirs
+SHELL_ENDORSED_DIRS="$SHELL_HOME/bin/lib"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ SHELL_HOME=`cygpath --path --windows "$SHELL_HOME"`
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ SHELL_CLASSPATH=`cygpath --path --windows "$SHELL_CLASSPATH"`
+ SHELL_ENDORSED_DIRS=`cygpath --path --windows "$SHELL_ENDORSED_DIRS"`
+fi
+
+# Display our environment
+#echo
"========================================================================="
+#echo ""
+#echo " Mobicents SS7 Management Shell Bootstrap Environment"
+#echo ""
+#echo " SHELL_HOME: $SHELL_HOME"
+#echo ""
+#echo " JAVA: $JAVA"
+#echo ""
+#echo " JAVA_OPTS: $JAVA_OPTS"
+#echo ""
+#echo " CLASSPATH: $SHELL_CLASSPATH"
+#echo ""
+#echo
"========================================================================="
+#echo ""
+
+ "$JAVA" $JAVA_OPTS \
+ -Djava.ext.dirs="$SHELL_ENDORSED_DIRS" \
+ -classpath "$SHELL_CLASSPATH" \
+ org.mobicents.ss7.management.console.Shell "$@"
+ SHELL_STATUS=$?
+
+#java -Djava.ext.dirs=`pwd`/lib -Dmms.home=.
-cp .:mms-standalone-2.0.0.BETA1-SNAPSHOT.jar
org.mobicents.media.server.bootstrap.jmx.JMXMain
=======================================
--- /management/shell/src/main/config/ss7-run.bat Mon Apr 23 10:53:14 2012
+++ /dev/null
@@ -1,145 +0,0 @@
-@echo off
-rem
-------------------------------------------------------------------------
-rem Mobicents SS7 CLI Bootstrap Script for Win32
-rem
-------------------------------------------------------------------------
-
-rem $Id: run.bat,v 1.5 2010/12/13 10:15:40 abhayani Exp $
-
-@if not "%ECHO%" == "" echo %ECHO%
-@if "%OS%" == "Windows_NT" setlocal
-
-set DIRNAME=.\
-if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
-set PROGNAME=run.bat
-if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
-
-pushd %DIRNAME%..
-set SHELL_HOME=%CD%
-echo ========
-echo %SHELL_HOME%
-
-popd
-
-REM Add bin/native to the PATH if present
-if exist "%SHELL_HOME%\native" set PATH=%SHELL_HOME%\native;%PATH%
-if exist "%SHELL_HOME%\native" set JAVA_OPTS=%JAVA_OPTS%
-Djava.library.path="%PATH%"
-
-REM Run section - here we define node and default ip
-set IP=127.0.0.1
-
-rem Read all command line arguments
-
-REM
-REM The %ARGS% env variable commented out in favor of using %* to include
-REM all args in java command line. See bug #840239. [jpl]
-REM
-REM set ARGS=
-REM :loop
-REM if [%1] == [] goto endloop
-REM set ARGS=%ARGS% %1
-REM shift
-REM goto loop
-REM :endloop
-
-
-set ARGS=""
-
-
-:loop
- if [%1] == [] goto endloop
- set ARGS=%ARGS% %1
- shift
- goto loop
- :endloop
-
-
-rem Find run.jar, or we can't continue
-
-set RUNJAR=%SHELL_HOME%\bin\mobicents-ss7-shell.jar
-if exist "%RUNJAR%" goto FOUND_RUN_JAR
-echo Could not locate %RUNJAR%. Please check that you are in the
-echo bin directory when running this script.
-goto END
-
-:FOUND_RUN_JAR
-
-if not "%JAVA_HOME%" == "" goto ADD_TOOLS
-
-set JAVA=java
-
-echo JAVA_HOME is not set. Unexpected results may occur.
-echo Set JAVA_HOME to the directory of your local JDK to avoid this
message.
-goto SKIP_TOOLS
-
-:ADD_TOOLS
-
-set JAVA=%JAVA_HOME%\bin\java
-
-rem A full JDK with toos.jar is not required anymore since jboss web
packages
-rem the eclipse jdt compiler and javassist has its own internal compiler.
-if not exist "%JAVA_HOME%\lib\tools.jar" goto SKIP_TOOLS
-
-rem If exists, point to the JDK javac compiler in case the user wants to
-rem later override the eclipse jdt compiler for compiling JSP pages.
-set JAVAC_JAR=%JAVA_HOME%\lib\tools.jar
-
-:SKIP_TOOLS
-
-rem If JBOSS_CLASSPATH or JAVAC_JAR is empty, don't include it, as this
will
-rem result in including the local directory in the classpath, which makes
-rem error tracking harder.
-if not "%JAVAC_JAR%" == "" set RUNJAR=%JAVAC_JAR%;%RUNJAR%
-if "%SHELL_CLASSPATH%" == "" set RUN_CLASSPATH=%RUNJAR%
-if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%SHELL_CLASSPATH%;%RUNJAR%
-
-set SHELL_CLASSPATH=%RUN_CLASSPATH%
-
-rem Setup JBoss specific properties
-set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
-
-rem Add -server to the JVM options, if supported
-"%JAVA%" -version 2>&1 | findstr /I hotspot > nul
-if not errorlevel == 1 (set JAVA_OPTS=%JAVA_OPTS% -server)
-
-rem JVM memory allocation pool parameters. Modify as appropriate.
-set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m
-
-rem profiler
-rem set JAVA_OPTS=%JAVA_OPTS%
-agentpath:C:\Users\kulikov\.netbeans\6.1\lib\deployed\jdk15\windows\profilerinterface.dll=C:\Users\kulikov\.netbeans\6.1\lib,5140
-rem set JAVA_OPTS=%JAVA_OPTS%
-agentpath:C:\Users\kulikov\.netbeans\6.1\lib\deployed\jdk16\windows\profilerinterface.dll=C:\Users\kulikov\.netbeans\6.1\lib,5140
-
-rem With Sun JVMs reduce the RMI GCs to once per hour
-set JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000
-Dsun.rmi.dgc.server.gcInterval=3600000
-
-rem JPDA options. Uncomment and modify as appropriate to enable remote
debugging.
-rem set JAVA_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y %JAVA_OPTS%
-
-rem Setup the java endorsed dirs
-set SHELL_ENDORSED_DIRS=%SHELL_HOME%\bin\lib
-
-
-echo
===============================================================================
-echo.
-echo Mobicents SS7 Management Shell Bootstrap Environment
-echo.
-echo SHELL_HOME: %SHELL_HOME%
-echo.
-echo JAVA: %JAVA%
-echo.
-echo JAVA_OPTS: %JAVA_OPTS%
-echo.
-echo CLASSPATH: %SHELL_CLASSPATH%
-echo
-echo SHELL_ENDORSED_DIRS: %SHELL_ENDORSED_DIRS%
-echo.
-echo
===============================================================================
-echo.
-
-:RESTART
-"%JAVA%" %JAVA_OPTS% -Djava.ext.dirs="%SHELL_ENDORSED_DIRS%"
-classpath "%SHELL_CLASSPATH%" org.mobicents.ss7.management.console.Shell %*
-rem if ERRORLEVEL 10 goto RESTART
-
-:END
-if "%NOPAUSE%" == "" pause
-
-:END_NO_PAUSE
=======================================
--- /management/shell/src/main/config/ss7-run.sh Tue Jul 3 02:19:47 2012
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/sh
-### ======================================================================
###
-##
##
-## Mobicents SS7 CLI Bootstrap Script ##
-##
##
-### ======================================================================
###
-
-### $Id: run.sh [email protected] $ ###
-
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
-GREP="grep"
-
-# Use the maximum available, or set MAX_FD != -1 to use that
-MAX_FD="maximum"
-
-#
-# Helper to complain.
-#
-warn() {
- echo "${PROGNAME}: $*"
-}
-
-#
-# Helper to puke.
-#
-die() {
- warn $*
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-darwin=false;
-linux=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-
- Darwin*)
- darwin=true
- ;;
-
- Linux)
- linux=true
- ;;
-esac
-
-
-# Force IPv4 on Linux systems since IPv6 doesn't work correctly with jdk5
and lower
-if [ "$linux" = "true" ]; then
- JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$SHELL_HOME" ] &&
- SHELL_HOME=`cygpath --unix "$SHELL_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$JAVAC_JAR" ] &&
- JAVAC_JAR=`cygpath --unix "$JAVAC_JAR"`
-fi
-
-# Setup SHELL_HOME
-if [ "x$SHELL_HOME" = "x" ]; then
- # get the full path (without any relative bits)
- SHELL_HOME=`cd $DIRNAME/..; pwd`
-fi
-export SHELL_HOME
-
-# Increase the maximum file descriptors if we can
-if [ "$cygwin" = "false" ]; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ]; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
- # use the system max
- MAX_FD="$MAX_FD_LIMIT"
- fi
-
- ulimit -n $MAX_FD
- if [ $? -ne 0 ]; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query system maximum file descriptor limit:
$MAX_FD_LIMIT"
- fi
-fi
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
- if [ "x$JAVA_HOME" != "x" ]; then
- JAVA="$JAVA_HOME/bin/java"
- else
- JAVA="java"
- fi
-fi
-
-# Setup the classpath
-runjar="$SHELL_HOME/lib/mobicents-ss7-shell.jar"
-if [ ! -f "$runjar" ]; then
- die "Missing required file: $runjar"
-fi
-
-SHELL_BOOT_CLASSPATH="$runjar"
-SHELL_CLASSPATH="$SHELL_HOME/lib/*"
-
-if [ "x$SHELL_CLASSPATH" = "x" ]; then
- SHELL_CLASSPATH="$SHELL_BOOT_CLASSPATH"
-else
- SHELL_CLASSPATH="$SHELL_CLASSPATH:$SHELL_BOOT_CLASSPATH"
-fi
-
-
-# If -server not set in JAVA_OPTS, set it, if supported
-SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
-if [ "x$SERVER_SET" = "x" ]; then
-
- # Check for SUN(tm) JVM w/ HotSpot support
- if [ "x$HAS_HOTSPOT" = "x" ]; then
- HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
- fi
-
- # Enable -server if we have Hotspot, unless we can't
- if [ "x$HAS_HOTSPOT" != "x" ]; then
- # MacOS does not support -server flag
- if [ "$darwin" != "true" ]; then
- JAVA_OPTS="-server $JAVA_OPTS"
- fi
- fi
-fi
-
-# Setup MMS specific properties
-JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"
-JAVA_OPTS="$JAVA_OPTS -Xms64m -Xmx64m
-Dsun.rmi.dgc.client.gcInterval=3600000
-Dsun.rmi.dgc.server.gcInterval=3600000"
-#JAVA_OPTS="$JAVA_OPTS
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
-# Setup the java endorsed dirs
-SHELL_ENDORSED_DIRS="$SHELL_HOME/bin/lib"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- SHELL_HOME=`cygpath --path --windows "$SHELL_HOME"`
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- SHELL_CLASSPATH=`cygpath --path --windows "$SHELL_CLASSPATH"`
- SHELL_ENDORSED_DIRS=`cygpath --path --windows "$SHELL_ENDORSED_DIRS"`
-fi
-
-# Display our environment
-#echo
"========================================================================="
-#echo ""
-#echo " Mobicents SS7 Management Shell Bootstrap Environment"
-#echo ""
-#echo " SHELL_HOME: $SHELL_HOME"
-#echo ""
-#echo " JAVA: $JAVA"
-#echo ""
-#echo " JAVA_OPTS: $JAVA_OPTS"
-#echo ""
-#echo " CLASSPATH: $SHELL_CLASSPATH"
-#echo ""
-#echo
"========================================================================="
-#echo ""
-
- "$JAVA" $JAVA_OPTS \
- -Djava.ext.dirs="$SHELL_ENDORSED_DIRS" \
- -classpath "$SHELL_CLASSPATH" \
- org.mobicents.ss7.management.console.Shell "$@"
- SHELL_STATUS=$?
-
-#java -Djava.ext.dirs=`pwd`/lib -Dmms.home=.
-cp .:mms-standalone-2.0.0.BETA1-SNAPSHOT.jar
org.mobicents.media.server.bootstrap.jmx.JMXMain
=======================================
--- /management/shell/pom.xml Thu Jul 5 06:40:31 2012
+++ /management/shell/pom.xml Sat Jul 7 04:40:38 2012
@@ -108,7 +108,6 @@
</plugin>
</plugins>
</build>
-
</profile>
<profile>
<id>telscale</id>
@@ -141,6 +140,55 @@
</plugin>
</plugins>
</build>
+ </profile>
+ <profile>
+ <!-- Adds the files to JBoss AS -->
+ <id>jboss</id>
+ <build>
+ <plugins>
+ <plugin>
+
<artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy</id>
+
<phase>install</phase>
+ <goals>
+
<goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy
todir="${jboss.home}/bin">
+ <fileset
dir="${project.build.directory}/${cli.prefix}-cli/bin"></fileset>
+
</copy>
+ <chmod
file="${jboss.home}/bin/ss7-cli.*" perm="700"/>
+ <copy
todir="${jboss.home}/lib">
+ <fileset
dir="${project.build.directory}/${cli.prefix}-cli/lib"></fileset>
+
</copy>
+ </tasks>
+ </configuration>
+ </execution>
+
+ <!-- TODO : Add
cleaning
+ <execution>
+
<id>undeploy</id>
+
<phase>clean</phase>
+ <goals>
+
<goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete
failonerror="false" includeemptydirs="true">
+
<fileset
+
dir="${jboss.home}/server/${node}/deploy/mobicents-ss7-service" />
+
</delete>
+ </tasks>
+ </configuration>
+ </execution>
+ -->
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
</project>
=======================================
--- /management/shell/src/main/assembly/pojo.xml Tue Jul 3 02:19:47 2012
+++ /management/shell/src/main/assembly/pojo.xml Sat Jul 7 04:40:38 2012
@@ -6,16 +6,16 @@
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
- <source>src/main/config/ss7-run.sh</source>
+ <source>src/main/config/ss7-cli.sh</source>
<fileMode>0744</fileMode>
<filtered>true</filtered>
- <destName>bin/run.sh</destName>
+ <destName>bin/ss7-cli.sh</destName>
</file>
<file>
- <source>src/main/config/ss7-run.bat</source>
+ <source>src/main/config/ss7-cli.bat</source>
<fileMode>0744</fileMode>
<filtered>true</filtered>
- <destName>bin/run.bat</destName>
+ <destName>bin/ss7-cli.bat</destName>
</file>
<file>
<source>target/mobicents-ss7-shell.jar</source>
@@ -31,7 +31,8 @@
<unpack>false</unpack>
<scope>runtime</scope>
<excludes>
-
+
<exclude>org.mobicents.protocols.ss7.scheduler:scheduler</exclude>
+
<exclude>org.mobicents.protocols.ss7.management:shell</exclude>
</excludes>
</dependencySet>
</dependencySets>
==============================================================================
Revision: 74ff2cef9544
Author: [email protected] <[email protected]>
Date: Sat Jul 7 04:41:11 2012
Log: Merge branch 'master' of
https://[email protected]/p/jss7/
http://code.google.com/p/jss7/source/detail?r=74ff2cef9544