[Smartfrog-checkins] core/smartfrog/bin sfRun.bat,1.8,1.9 sfDaemon.bat,1.8,1.9 setSFProperties.bat,1.4,1.5 setClassPath.bat,1.2,1.3

[Julio G. <ju...@us...>]

Update of /cvsroot/smartfrog/core/smartfrog/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13281

Modified Files:
	sfRun.bat sfDaemon.bat setSFProperties.bat setClassPath.bat 
Log Message:
Refactoring.

Index: setSFProperties.bat
===================================================================
RCS file: /cvsroot/smartfrog/core/smartfrog/bin/setSFProperties.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** setSFProperties.bat	30 Jul 2004 11:04:14 -0000	1.4
--- setSFProperties.bat	30 Jul 2004 13:49:13 -0000	1.5
***************
*** 12,15 ****
--- 12,16 ----
  rem ------------------------------------------------------
  
+ rem set SFUSERHOME = %SFHOME%\mylibs
  if not defined SFDEFAULTINI set SFDEFAULTINI=-Dorg.smartfrog.iniFile=org/smartfrog/default.ini
  if not defined SFDEFAULTSF set SFDEFAULTSF=-Dorg.smartfrog.sfcore.processcompound.sfDefault.sfDefault=org/smartfrog/default.sf
***************
*** 25,29 ****
--- 26,40 ----
  if defined SFSECURITY set SFLIBPATH=%SFHOME%\signedLib
  
+ rem reset CLASSPATH
+ set CLASSPATH=
+ 
  call "%SFHOME%\bin\setClassPath"
  
+ if not defined SFUSERHOME goto continue2
+   set SFLIBPATH=%SFUSERHOME%
+   CALL "%SFHOME%\bin\setClassPath.bat"
+ :continue2
+ 
+ if defined srcDir set CLASSPATH=%srcDir%;%classpath%
+ 
  

Index: sfDaemon.bat
===================================================================
RCS file: /cvsroot/smartfrog/core/smartfrog/bin/sfDaemon.bat,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sfDaemon.bat	29 Jul 2004 11:50:00 -0000	1.8
--- sfDaemon.bat	30 Jul 2004 13:49:13 -0000	1.9
***************
*** 13,17 ****
  call "%SFHOME%\bin\setSFProperties"
  
! rem sfDefault files only need it in sfDaemon and sfRun
  if defined SFDEFAULTSF  set SFCMDPARAMETERS=%SFCMDPARAMETERS% %SFDEFAULTSF%
  
--- 13,17 ----
  call "%SFHOME%\bin\setSFProperties"
  
! rem sfDefault files are only needed in sfDaemon and sfRun
  if defined SFDEFAULTSF  set SFCMDPARAMETERS=%SFCMDPARAMETERS% %SFDEFAULTSF%
  

Index: setClassPath.bat
===================================================================
RCS file: /cvsroot/smartfrog/core/smartfrog/bin/setClassPath.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setClassPath.bat	30 Jul 2004 11:04:14 -0000	1.2
--- setClassPath.bat	30 Jul 2004 13:49:13 -0000	1.3
***************
*** 7,11 ****
  :continue1
  
! set CLASSPATH=
  set cd=
  for /f "tokens=*" %%i in (
--- 7,11 ----
  :continue1
  
! rem set CLASSPATH=  (This is reset in setSFProperties.bat)
  set cd=
  for /f "tokens=*" %%i in (
***************
*** 25,33 ****
  :MORE
  
- if not defined SFUSERHOME goto continue2
-   set SFLIBPATH=%SFUSERHOME%
-   set SFUSERHOME=
-   CALL "%SFHOME%\bin\setClassPath.bat"
- :continue2
- 
- if defined srcDir set CLASSPATH=%srcDir%;%classpath%
--- 25,26 ----

Index: sfRun.bat
===================================================================
RCS file: /cvsroot/smartfrog/core/smartfrog/bin/sfRun.bat,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sfRun.bat	29 Jul 2004 11:50:15 -0000	1.8
--- sfRun.bat	30 Jul 2004 13:49:13 -0000	1.9
***************
*** 13,17 ****
  call "%SFHOME%\bin\setSFProperties"
  
! rem sfDefault files only need it in sfDaemon and sfRun
  if defined SFDEFAULTSF  set SFCMDPARAMETERS=%SFCMDPARAMETERS% %SFDEFAULTSF%
  
--- 13,17 ----
  call "%SFHOME%\bin\setSFProperties"
  
! rem sfDefault files are only needed in sfDaemon and sfRun
  if defined SFDEFAULTSF  set SFCMDPARAMETERS=%SFCMDPARAMETERS% %SFDEFAULTSF%