jcscoobyrs    2005/10/11 13:18:58

  Modified:    modules/core/src/bin openejb openejb.bat
  Removed:     modules/core/src/bin corba.txt deploy-examples.txt
                        ejbserver-examples.txt create_stubs.txt start.txt
                        deploy.txt stop.txt stop-examples.txt commands.txt
                        validate-examples.txt validate.txt
  Log:

  Updated for new launching concept.  Removed all unused scripts, all 
unecessary text files and all references to unused code, like Corba.  All 
scripts have been updated to use the new launch concept.  Scripts could be 
refactored a bit to utilize the new launcher a bit better but for flow control, 
the scripts have been kept as-is in this respect.
  
  Revision  Changes    Path
  1.6       +45 -50    openejb1/modules/core/src/bin/openejb
  
  Index: openejb
  ===================================================================
  RCS file: /scm/openejb/openejb1/modules/core/src/bin/openejb,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- openejb   29 Aug 2005 07:24:40 -0000      1.5
  +++ openejb   11 Oct 2005 17:18:58 -0000      1.6
  @@ -66,25 +66,22 @@
   {
       case $2 in
           "validate")
  -            cat $OPENEJB_HOME/bin/validate.txt
  +            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar validate --help
           ;;
           "deploy")
  -            cat $OPENEJB_HOME/bin/deploy.txt 
  +            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar deploy --help
           ;;
           "start")
  -            cat $OPENEJB_HOME/bin/start.txt
  +            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar start --help
           ;;
           "stop")
  -            cat $OPENEJB_HOME/bin/stop.txt
  +            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar stop --help
           ;;
  -        "corba")
  -            cat $OPENEJB_HOME/bin/corba.txt
  -        ;;
  -        "create_stubs")
  -            cat $OPENEJB_HOME/bin/create_stubs.txt
  +        "test")
  +            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar test --help
           ;;
           *)
  -            cat $OPENEJB_HOME/bin/commands.txt
  +            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar
           ;;
       esac
   }
  @@ -92,64 +89,62 @@
   _command_deploy()
   {
      shift
  -   java $OPTIONS -cp $OPENEJB_HOME/lib/openejb-core-*.jar 
org.openejb.util.Launcher org.openejb.alt.config.Deploy $@
  +   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar deploy $@
   }
   #============================================================
   _command_validate()
   {
      shift
  -   java $OPTIONS -cp $OPENEJB_HOME/lib/openejb-core-*.jar 
org.openejb.util.Launcher org.openejb.alt.config.EjbValidator $@
  +   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar validate $@
   }
   #============================================================
   _command_start()
   {
  -   java $OPTIONS -cp $OPENEJB_HOME/lib/openejb-core-*.jar 
org.openejb.util.Launcher org.openejb.server.Main $@
  +   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar start $@
   }
   #============================================================
   _command_stop()
   {
  -   java $OPTIONS -cp $OPENEJB_HOME/lib/openejb-core-*.jar 
org.openejb.util.Launcher org.openejb.server.Stop $@
  +   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar stop $@
   }
   #============================================================
  -_start_corba()
  +_test_intravm()
   {
  -   echo " 1. OpenORB RMI/IIOP JNDI Naming Server..."
  -   
  -   
NAMING_OPTIONS="-Djava.naming.factory.initial=org.openorb.rmi.jndi.CtxFactory \
  -          -Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB \
  -          -Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton \
  -          
-Djavax.rmi.CORBA.StubClass=org.openorb.rmi.system.StubDelegateImpl \
  -          
-Djavax.rmi.CORBA.UtilClass=org.openorb.rmi.system.UtilDelegateImpl \
  -          
-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.openorb.rmi.system.PortableRemoteObjectDelegateImpl"
  -   java $OPTIONS -cp $OPENEJB_HOME/lib/openejb-core-*.jar 
org.openejb.util.Launcher $NAMING_OPTIONS \
  -        org.openorb.util.MapNamingContext -ORBPort=2001 -print > 
logs/jndi.log 2>&1 &
  -   
  -   pid=$?
  -   trap ' kill $pid; exit 1' 1 2 15
  -   sleep 20
  -   echo " 2. OpenEJB RMI/IIOP Server..."
  -
  -   
OPENORB_OPTIONS="-Djava.naming.provider.url=corbaloc::localhost:2001/NameService
 \
  -           -Djava.naming.factory.initial=org.openorb.rmi.jndi.CtxFactory \
  -           -Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB \
  -           -Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton \
  -           
-Djavax.rmi.CORBA.StubClass=org.openorb.rmi.system.StubDelegateImpl \
  -           
-Djavax.rmi.CORBA.UtilClass=org.openejb.corba.core.UtilDelegateImpl \
  -           
-Dorg.openejb.corba.core.UtilDelegateClass=org.openorb.rmi.system.UtilDelegateImpl
 \
  -           
-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.openorb.rmi.system.PortableRemoteObjectDelegateImpl"
  -   SERVER_OPTIONS="-Dlog4j.configuration=file:conf/default.logging.conf \
  -           
-Dorg/openejb/core/ThreadContext/IMPL_CLASS=org.openejb.tyrex.TyrexThreadContext"
  -   java $OPTIONS -cp $OPENEJB_HOME/lib/openejb-core-*.jar 
org.openejb.util.Launcher $SERVER_OPTIONS $OPENORB_OPTIONS \
  -        org.openejb.corba.Server -ORBProfile=ejb -domain 
conf/tyrex_resources.xml
  +   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar test local
   }
   #============================================================
  -_create_stubs()
  +_test_server()
   {
  -   shift
  -   if [ ! -z "$1" ]; then
  -      JAVATOIDL_OPTS="-tie -stub -noidl -local"
  -   fi
  -   java $OPTIONS -cp $OPENEJB_HOME/lib/openejb-core-*.jar 
org.openejb.util.Launcher $OPTIONS org.openorb.rmi.compiler.JavaToIdl 
$JAVATOIDL_OPTS $@
  +   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar test remote
  +}
  +#============================================================
  +_command_test()
  +{
  +case $2 in
  +    "local")
  +        _test_intravm
  +    ;;
  +    "remote")
  +        _test_server
  +    ;;
  +    "--help")
  +        _test_help
  +    ;;
  +    *)
  +        _test_noargs
  +    ;;
  +esac
  +}
  +#============================================================
  +_test_help()
  +{
  +   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar test --help
  +}
  +#============================================================
  +_test_noargs()
  +{
  +   _test_intravm
  +   _test_server
   }
   #============================================================
   case $1 in
  
  
  
  1.4       +26 -223   openejb1/modules/core/src/bin/openejb.bat
  
  Index: openejb.bat
  ===================================================================
  RCS file: /scm/openejb/openejb1/modules/core/src/bin/openejb.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- openejb.bat       12 Aug 2004 21:08:48 -0000      1.3
  +++ openejb.bat       11 Oct 2005 17:18:58 -0000      1.4
  @@ -17,33 +17,10 @@
   
   SETLOCAL
   
  -rem %~dp0 is expanded pathname of the current script under NT
  -set DEFAULT_ANT_HOME=%~dp0..
  -
  -if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
  -set DEFAULT_ANT_HOME=
  -
   rem find OPENEJB_HOME if it does not exist due to either an invalid value 
passed
   rem by the user or the %0 problem on Windows 9x
   if exist "%OPENEJB_HOME%\lib\openejb-core-*.jar" goto openejbHomeSet
   
  -rem check for OpenEJB in Program Files
  -if not exist "%ProgramFiles%\openejb" goto checkSystemDrive
  -set ANT_HOME=%ProgramFiles%\openejb
  -goto openejbHomeSet
  -
  -:checkSystemDrive
  -rem check for ant in root directory of system drive
  -if not exist %SystemDrive%\openejb\lib\openejb-core-*.jar goto checkCDrive
  -set ANT_HOME=%SystemDrive%\openejb
  -goto openejbHomeSet
  -
  -:checkCDrive
  -rem check for openejb in C:\openejb for Win9X users
  -if not exist C:\openejb\lib\openejb-core-*.jar goto noOpenEJBHome
  -set OPENEJB_HOME=C:\openejb
  -goto openejbHomeSet
  -
   :noOpenEJBHome
   echo OPENEJB_HOME is set incorrectly or OpenEJB could not be located. Please 
set OPENEJB_HOME.
   goto EOF
  @@ -55,47 +32,26 @@
   set P2=_%2
   
   if /I %P1% EQU _TEST         goto TEST
  -if /I %P1% EQU _BUILD        goto BUILD
   if /I %P1% EQU _VALIDATE     goto VALIDATE 
   if /I %P1% EQU _DEPLOY       goto DEPLOY 
   if /I %P1% EQU _START        goto START_SERVER
   if /I %P1% EQU _STOP         goto STOP_SERVER
  -if /I %P1% EQU _CORBA        goto CORBA
  -if /I %P1% EQU _CREATE_STUBS goto CREATE_STUBS
  -if /I %P1% EQU _HELP         goto HELP
  -if /I %P1% EQU _-HELP        goto HELP
  -if /I %P1% EQU _--HELP       goto HELP
   
  -echo Unknown command: %1
  -more < %OPENEJB_HOME%\bin\commands.txt
  +echo Unknown option: %1
  +goto HELP
   
   goto EOF
   REM================================================
   :HELP
  -   if /I %P2% EQU _BUILD        goto HELP_BUILD
  -   if /I %P2% EQU _TEST         goto HELP_TEST
  -   if /I %P2% EQU _VALIDATE     goto HELP_VALIDATE
  -   if /I %P2% EQU _DEPLOY       goto HELP_DEPLOY
  -   if /I %P2% EQU _START        goto HELP_START
  -   if /I %P2% EQU _STOP         goto HELP_STOP
  -   if /I %P2% EQU _CORBA        goto HELP_CORBA
  -   if /I %P2% EQU _CREATE_STUBS goto HELP_CREATE_STUBS
  -
  -   REM TODO Update commands.txt with CORBA and CREATE_STUBS
  -   more < %OPENEJB_HOME%\bin\commands.txt
  -
  -goto EOF
  -REM================================================
  -:BUILD
  -    ant -f %OPENEJB_HOME%\src\build.xml %2 %3 %4 %5 %6 %7 %8
  +   
  +     java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar
   
   goto EOF
   REM================================================
   :TEST
      if /I %P2% EQU _LOCAL     goto TEST_INTRAVM
      if /I %P2% EQU _REMOTE    goto TEST_SERVER
  -   if /I %P2% EQU _CORBA     goto TEST_CORBA
  -   if /I %P2% EQU _HELP      goto HELP_TEST
  +   if /I %P2% EQU _--HELP    goto HELP_TEST
      if /I %P2% EQU _          goto TEST_NOARGS
   
      echo Unknown option: %2
  @@ -105,225 +61,72 @@
   REM================================================
   :VALIDATE 
      shift
  -   java %OPTIONS% -cp %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar 
org.openejb.alt.config.EjbValidator %1 %2 %3 %4 %5 %6 %7 %8 %9
  +   java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar validate %1 %2 %3 %4 
%5 %6 %7 %8 %9
   
   goto EOF
   REM================================================
   :DEPLOY 
      shift
  -   java %OPTIONS% -cp %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar 
org.openejb.util.Launcher org.openejb.alt.config.Deploy %1 %2 %3 %4 %5 %6 %7 %8 
%9
  +   java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar deploy %1 %2 %3 %4 %5 
%6 %7 %8 %9
   
   goto EOF
   REM================================================
   :START_SERVER
      shift
  -   java %OPTIONS% -cp %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar 
org.openejb.util.Launcher org.openejb.server.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
  +   java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar start %1 %2 %3 %4 %5 
%6 %7 %8 %9
   
   goto EOF
   REM================================================
   :STOP_SERVER
      shift
  -   java %OPTIONS% -cp %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar 
org.openejb.util.Launcher org.openejb.server.Stop %1 %2 %3 %4 %5 %6 %7 %8 %9
  -
  -goto EOF
  -REM================================================
  -:CORBA
  -   echo 1. OpenORB RMI/IIOP JNDI Naming Server...
  -   
  -   set 
NAMING_OPTIONS=-Djava.naming.factory.initial=org.openorb.rmi.jndi.CtxFactory
  -   set NAMING_OPTIONS=%NAMING_OPTIONS% 
-Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB
  -   set NAMING_OPTIONS=%NAMING_OPTIONS% 
-Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton
  -   set NAMING_OPTIONS=%NAMING_OPTIONS% 
-Djavax.rmi.CORBA.StubClass=org.openorb.rmi.system.StubDelegateImpl
  -   set NAMING_OPTIONS=%NAMING_OPTIONS% 
-Djavax.rmi.CORBA.UtilClass=org.openorb.rmi.system.UtilDelegateImpl
  -   set NAMING_OPTIONS=%NAMING_OPTIONS% 
-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.openorb.rmi.system.PortableRemoteObjectDelegateImpl
  -
  -   REM  >logs\jndi.log 2>&1 doesn't work with 'start'
  -   start "OpenORB JNDI Server" java %OPTIONS% -cp %OPENEJB_HOME%/lib/[EMAIL 
PROTECTED]@.jar org.openejb.util.Launcher %NAMING_OPTIONS% 
org.openorb.util.MapNamingContext -ORBPort=2001 -print
  -
  -   sleep 20
  -   echo 2. OpenEJB RMI/IIOP Server...
  -
  -   set 
OPENORB_OPTIONS=-Djava.naming.provider.url=corbaloc::localhost:2001/NameService
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Djava.naming.factory.initial=org.openorb.rmi.jndi.CtxFactory
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Djavax.rmi.CORBA.StubClass=org.openorb.rmi.system.StubDelegateImpl
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Djavax.rmi.CORBA.UtilClass=org.openejb.corba.core.UtilDelegateImpl
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Dorg.openejb.corba.core.UtilDelegateClass=org.openorb.rmi.system.UtilDelegateImpl
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.openorb.rmi.system.PortableRemoteObjectDelegateImpl
  -
  -   set SERVER_OPTIONS=-Dlog4j.configuration=file:conf/default.logging.conf
  -   set SERVER_OPTIONS=%SERVER_OPTIONS% 
-Dorg/openejb/core/ThreadContext/IMPL_CLASS=org.openejb.tyrex.TyrexThreadContext
  -   java %OPTIONS% -cp %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar 
org.openejb.util.Launcher %SERVER_OPTIONS% %OPENORB_OPTIONS% 
org.openejb.corba.Server -ORBProfile=ejb -domain conf\tyrex_resources.xml
  +   java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar stop %1 %2 %3 %4 %5 
%6 %7 %8 %9
   
   goto EOF
   REM================================================
   :TEST_NOARGS
  -   echo "_________________________________________________"
  -   echo "|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|"
  -   echo " "
  -   echo "Running EJB compliance tests on IntraVM Server"
  -   echo "_________________________________________________"
  -
  -   set 
PROPERTIES="-Dopenejb.testsuite.properties=src/tests-ejb/IvmServer_config.properties"
  -   set SERVER="-Dopenejb.test.server=org.openejb.test.IvmTestServer"
  -   set 
DATABASE="-Dopenejb.test.database=org.openejb.test.InstantDbTestDatabase"
  -   set SUITE="org.openejb.test.ClientTestSuite"
  -   
  -   java %PROPERTIES% %SERVER% %DATABASE% %OPTIONS% -jar 
%OPENEJB_HOME%/dist/[EMAIL PROTECTED]@.jar %SUITE%
  -
  -   echo "_________________________________________________"
  -   echo "|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|"
  -   echo " "
  -   echo "Running EJB compliance tests on Remote Server"
  -   echo "_________________________________________________"
  -
  -   set 
PROPERTIES="-Dopenejb.testsuite.properties=src/tests-ejb/RemoteServer_config.properties"
  -   set SERVER="-Dopenejb.test.server=org.openejb.test.RemoteTestServer"
  -   set 
DATABASE="-Dopenejb.test.database=org.openejb.test.InstantDbTestDatabase"
  -   set SUITE="org.openejb.test.ClientTestSuite"
  -   
  -   java %PROPERTIES% %SERVER% %DATABASE% %OPTIONS% -jar 
%OPENEJB_HOME%/dist/[EMAIL PROTECTED]@.jar %SUITE%
  -
  -   REM Invoke CORBA tests
  -   REM TODO the following doesn't work, but gives the idea of what shall be 
done
  -   REM GOTO TEST_CORBA
  -   
  +   goto TEST_INTRAVM
   goto EOF
   REM================================================
   :TEST_INTRAVM
  -   echo "_________________________________________________"
  -   echo "|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|"
  -   echo " "
  -   echo "Running EJB compliance tests on IntraVM Server"
  -   echo "_________________________________________________"
  -
  -   set 
PROPERTIES="-Dopenejb.testsuite.properties=src/tests-ejb/IvmServer_config.properties"
  -   set SERVER="-Dopenejb.test.server=org.openejb.test.IvmTestServer"
  -   set 
DATABASE="-Dopenejb.test.database=org.openejb.test.InstantDbTestDatabase"
  -   set SUITE="org.openejb.test.ClientTestSuite"
  -   
  -   java %PROPERTIES% %SERVER% %DATABASE% %OPTIONS% -jar 
%OPENEJB_HOME%/dist/[EMAIL PROTECTED]@.jar %SUITE%
  +
  +   java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar test local
            
  +if /I %P2% EQU _ goto TEST_SERVER
   goto EOF
   REM================================================
   :TEST_SERVER
  -   echo "_________________________________________________"
  -   echo "|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|"
  -   echo " "
  -   echo "Running EJB compliance tests on Remote Server"
  -   echo "_________________________________________________"
  -
  -   set 
PROPERTIES="-Dopenejb.testsuite.properties=src/tests-ejb/RemoteServer_config.properties"
  -   set SERVER="-Dopenejb.test.server=org.openejb.test.RemoteTestServer"
  -   set 
DATABASE="-Dopenejb.test.database=org.openejb.test.InstantDbTestDatabase"
  -   set SUITE="org.openejb.test.ClientTestSuite"
  -   
  -   java %PROPERTIES% %SERVER% %DATABASE% %OPTIONS% -jar 
%OPENEJB_HOME%/dist/[EMAIL PROTECTED]@.jar %SUITE%
   
  -goto EOF
  -REM================================================
  -:TEST_CORBA
  -   echo "_________________________________________________"
  -   echo "|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|"
  -   echo " "
  -   echo "Running EJB compliance tests on CORBA Server"
  -   echo "_________________________________________________"
  -
  -   echo 1. OpenORB RMI/IIOP JNDI Naming Server...
  -   
  -   set 
NAMING_OPTIONS=-Djava.naming.factory.initial=org.openorb.rmi.jndi.CtxFactory
  -   set NAMING_OPTIONS=%NAMING_OPTIONS% 
-Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB
  -   set NAMING_OPTIONS=%NAMING_OPTIONS% 
-Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton
  -   set NAMING_OPTIONS=%NAMING_OPTIONS% 
-Djavax.rmi.CORBA.StubClass=org.openorb.rmi.system.StubDelegateImpl
  -   set NAMING_OPTIONS=%NAMING_OPTIONS% 
-Djavax.rmi.CORBA.UtilClass=org.openorb.rmi.system.UtilDelegateImpl
  -   set NAMING_OPTIONS=%NAMING_OPTIONS% 
-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.openorb.rmi.system.PortableRemoteObjectDelegateImpl
  -
  -   REM  >logs\corba.jndi.log 2>&1 doesn't work with 'start'
  -   start "OpenORB JNDI Server" java %OPTIONS% -cp %OPENEJB_HOME%/lib/[EMAIL 
PROTECTED]@.jar org.openejb.util.Launcher %NAMING_OPTIONS% 
org.openorb.util.MapNamingContext -ORBPort=2001 -default
  -
  -   sleep 20
  -   echo 2. OpenEJB RMI/IIOP Server...
  -
  -   set 
OPENORB_OPTIONS=-Djava.naming.provider.url=corbaloc::localhost:2001/NameService
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Djava.naming.factory.initial=org.openorb.rmi.jndi.CtxFactory
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Djavax.rmi.CORBA.StubClass=org.openorb.rmi.system.StubDelegateImpl
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Djavax.rmi.CORBA.UtilClass=org.openejb.corba.core.UtilDelegateImpl
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Dorg.openejb.corba.core.UtilDelegateClass=org.openorb.rmi.system.UtilDelegateImpl
  -   set OPENORB_OPTIONS=%OPENORB_OPTIONS% 
-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.openorb.rmi.system.PortableRemoteObjectDelegateImpl
  -
  -   set SERVER_OPTIONS=-Dlog4j.configuration=file:conf/default.logging.conf
  -   set SERVER_OPTIONS=%SERVER_OPTIONS% 
-Dorg/openejb/core/ThreadContext/IMPL_CLASS=org.openejb.tyrex.TyrexThreadContext
  -   REM  > logs\corba.server.log 2>&1 doesn't work with 'start'
  -   start "OpenEJB RMI/IIOP Server" java %OPTIONS% -cp 
%OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar org.openejb.util.Launcher 
%SERVER_OPTIONS% %OPENORB_OPTIONS% org.openejb.corba.Server -ORBProfile=ejb 
-domain conf\tyrex_resources.xml
  -
  -   echo 3. Starting test client...
  -
  -   set ORB=-DORBProfile=ejb
  -   set ORB=%ORB% 
-Djava.naming.provider.url=corbaloc::localhost:2001/NameService
  -   set ORB=%ORB% 
-Djava.naming.factory.initial=org.openorb.rmi.jndi.CtxFactory
  -   set ORB=%ORB% -Dorg.omg.CORBA.ORBClass=org.openorb.CORBA.ORB
  -   set ORB=%ORB% 
-Dorg.omg.CORBA.ORBSingletonClass=org.openorb.CORBA.ORBSingleton
  -   set ORB=%ORB% 
-Djavax.rmi.CORBA.StubClass=org.openorb.rmi.system.StubDelegateImpl
  -   set ORB=%ORB% 
-Djavax.rmi.CORBA.UtilClass=org.openorb.rmi.system.UtilDelegateImpl
  -   set ORB=%ORB% 
-Djavax.rmi.CORBA.PortableRemoteObjectClass=org.openorb.rmi.system.PortableRemoteObjectDelegateImpl
  -
  -   set 
PROPERTIES="-Dopenejb.testsuite.properties=src/tests-ejb/CorbaServer_config.properties"
  -   set SERVER="-Dopenejb.test.server=org.openejb.test.CorbaTestServer"
  -   set 
DATABASE="-Dopenejb.test.database=org.openejb.test.InstantDbTestDatabase"
  -   set SUITE="org.openejb.test.ClientTestSuite"
  -
  -   java %PROPERTIES% %SERVER% %DATABASE% %OPTIONS% %ORB% -jar 
%OPENEJB_HOME%/dist/[EMAIL PROTECTED]@.jar %SUITE% 
  -
  -goto EOF
  -REM================================================
  -:CREATE_STUBS
  -   SHIFT
  -   IF DEFINED %1 set JAVATOIDL_OPTS=-tie -stub -noidl -local
  -
  -   java %OPTIONS% -cp %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar 
org.openejb.util.Launcher %OPTIONS% org.openorb.rmi.compiler.JavaToIdl 
%JAVATOIDL_OPTS% %1 %2 %3 %4 %5 %6 %7 %8 %9
  -
  -goto EOF
  -REM================================================
  -:HELP_BUILD
  -   ant -f %OPENEJB_HOME%/src/build.xml -projecthelp    
  +   java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar test remote
      
   goto EOF
   REM================================================
   :HELP_TEST
  -   more < %OPENEJB_HOME%/bin/test.txt    
  +   
  +     java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar test --help
   
   goto EOF
   REM================================================
   :HELP_DEPLOY
  -   more < %OPENEJB_HOME%/bin/deploy.txt
  -
  +   
  +     java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar deploy --help
  +     
   goto EOF
   REM================================================
   :HELP_VALIDATE
  -   more < %OPENEJB_HOME%/bin/validate.txt
  +   
  +     java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar validate --help
   
   goto EOF
   REM================================================
   :HELP_START
  -   more < %OPENEJB_HOME%/bin/start.txt
  +   
  +     java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar start --help
   
   goto EOF
   REM================================================
   :HELP_STOP
  -   more < %OPENEJB_HOME%/bin/stop.txt
  -
  -goto EOF
  -REM================================================
  -:HELP_CORBA
  -   more < %OPENEJB_HOME%/bin/corba.txt
  -
  -goto EOF
  -REM================================================
  -:HELP_CREATE_STUBS
  -   more < %OPENEJB_HOME%/bin/create_stubs.txt    
  +   
  +     java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar stop --help
   
   goto EOF
   
  
  
  

Reply via email to