[Jibx-cvs] xsd2jibx/bin jibx-bind.sh,1.2,1.3 xsd2jibx_classpath.sh,1.2,1.3 xsd2jibx.bat,1.3,1.4 jibx-bind.bat,1.2,1.3 log4j.properties,1.1,1.2

[Cameron T. <cta...@us...>]

Update of /cvsroot/jibx/xsd2jibx/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14148/bin

Modified Files:
	jibx-bind.sh xsd2jibx_classpath.sh xsd2jibx.bat jibx-bind.bat 
	log4j.properties 
Log Message:
jibx not included

Index: jibx-bind.bat
===================================================================
RCS file: /cvsroot/jibx/xsd2jibx/bin/jibx-bind.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** jibx-bind.bat	29 May 2004 18:57:13 -0000	1.2
--- jibx-bind.bat	29 May 2004 21:37:12 -0000	1.3
***************
*** 1,8 ****
  @echo off
  
! if "%XSD2JIBX_HOME%" == "" echo Please set XSD2JIBX_HOME environment variable before running.
! if "%XSD2JIBX_HOME%" == "" goto end
  
! set cp=%XSD2JIBX_HOME%\lib\jibx-1.0b3b\jibx-bind.jar
  
  java %JAVA_OPTS% -classpath %cp% org.jibx.binding.Compile %*
--- 1,8 ----
  @echo off
  
! if "%JIBX_HOME%" == "" echo Please set JIBX_HOME environment variable before running.
! if "%JIBX_HOME%" == "" goto end
  
! set cp=%JIBX_HOME%\lib\jibx-bind.jar
  
  java %JAVA_OPTS% -classpath %cp% org.jibx.binding.Compile %*

Index: jibx-bind.sh
===================================================================
RCS file: /cvsroot/jibx/xsd2jibx/bin/jibx-bind.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** jibx-bind.sh	29 May 2004 18:57:13 -0000	1.2
--- jibx-bind.sh	29 May 2004 21:37:12 -0000	1.3
***************
*** 1,10 ****
  #! /bin/bash
  
! if [ "$XSD2JIBX_HOME" = "" ]; then
!   echo "Please set XSD2JIBX_HOME environment variable before running."
    exit 1
  fi
  
! cp=$XSD2JIBX_HOME/lib/jibx-1.0b3b/jibx-bind.jar
  
  java $JAVA_OPTS -classpath $cp org.jibx.binding.Compile $*
--- 1,10 ----
  #! /bin/bash
  
! if [ "$JIBX_HOME" = "" ]; then
!   echo "Please set JIBX_HOME environment variable before running."
    exit 1
  fi
  
! cp=$JIBX_HOME/lib/jibx-bind.jar
  
  java $JAVA_OPTS -classpath $cp org.jibx.binding.Compile $*

Index: xsd2jibx.bat
===================================================================
RCS file: /cvsroot/jibx/xsd2jibx/bin/xsd2jibx.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xsd2jibx.bat	29 May 2004 18:57:13 -0000	1.3
--- xsd2jibx.bat	29 May 2004 21:37:12 -0000	1.4
***************
*** 3,12 ****
  if "%XSD2JIBX_HOME%" == "" echo Please set XSD2JIBX_HOME environment variable before running.
  if "%XSD2JIBX_HOME%" == "" goto end
  
  set cp=.;%XSD2JIBX_HOME%\bin
  set cp=%cp%;%XSD2JIBX_HOME%\build\xsd2jibx.jar
  set cp=%cp%;%XSD2JIBX_HOME%\lib\jaxme-0.2\jaxmejs.jar
! set cp=%cp%;%XSD2JIBX_HOME%\lib\jibx-1.0b3b\jibx-run.jar
! set cp=%cp%;%XSD2JIBX_HOME%\lib\jibx-1.0b3b\xpp3.jar
  set cp=%cp%;%XSD2JIBX_HOME%\lib\log4j-1.2.8\log4j-1.2.8.jar
  
--- 3,14 ----
  if "%XSD2JIBX_HOME%" == "" echo Please set XSD2JIBX_HOME environment variable before running.
  if "%XSD2JIBX_HOME%" == "" goto end
+ if "%JIBX_HOME%" == "" echo Please set JIBX_HOME environment variable before running.
+ if "%JIBX_HOME%" == "" goto end
  
  set cp=.;%XSD2JIBX_HOME%\bin
  set cp=%cp%;%XSD2JIBX_HOME%\build\xsd2jibx.jar
  set cp=%cp%;%XSD2JIBX_HOME%\lib\jaxme-0.2\jaxmejs.jar
! set cp=%cp%;%JIBX_HOME%\lib\jibx-run.jar
! set cp=%cp%;%JIBX_HOME%\lib\xpp3.jar
  set cp=%cp%;%XSD2JIBX_HOME%\lib\log4j-1.2.8\log4j-1.2.8.jar
  

Index: log4j.properties
===================================================================
RCS file: /cvsroot/jibx/xsd2jibx/bin/log4j.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** log4j.properties	4 Apr 2004 07:38:27 -0000	1.1
--- log4j.properties	29 May 2004 21:37:12 -0000	1.2
***************
*** 1,13 ****
! # http://jakarta.apache.org/log4j/docs/manual.html
! 
! # direct log messages to stdout
! log4j.appender.stdout=org.apache.log4j.ConsoleAppender
! log4j.appender.stdout.Target=System.out
! log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
! #log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
! log4j.appender.stdout.layout.ConversionPattern=%p %c{1}:%L %m%n
! 
! log4j.rootLogger=info, stdout
! #log4j.rootLogger=debug, stdout
! 
! 
--- 1,13 ----
! # http://jakarta.apache.org/log4j/docs/manual.html
! 
! # direct log messages to stdout
! log4j.appender.stdout=org.apache.log4j.ConsoleAppender
! log4j.appender.stdout.Target=System.out
! log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
! #log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
! log4j.appender.stdout.layout.ConversionPattern=%p %c{1}:%L %m%n
! 
! #log4j.rootLogger=info, stdout
! log4j.rootLogger=debug, stdout
! 
! 

Index: xsd2jibx_classpath.sh
===================================================================
RCS file: /cvsroot/jibx/xsd2jibx/bin/xsd2jibx_classpath.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xsd2jibx_classpath.sh	29 May 2004 18:57:13 -0000	1.2
--- xsd2jibx_classpath.sh	29 May 2004 21:37:12 -0000	1.3
***************
*** 3,6 ****
--- 3,13 ----
  if [ "$XSD2JIBX_HOME" = "" ]; then
    echo "Please set XSD2JIBX_HOME environment variable before running."
+   abort=1
+ fi
+ if [ "$JIBX_HOME" = "" ]; then
+   echo "Please set JIBX_HOME environment variable before running."
+   abort=1
+ fi
+ if [ $abort ]; then
    exit 1
  fi
***************
*** 9,14 ****
  cp=$cp:$XSD2JIBX_HOME/build/xsd2jibx.jar
  cp=$cp:$XSD2JIBX_HOME/lib/jaxme-0.2/jaxmejs.jar
! cp=$cp:$XSD2JIBX_HOME/lib/jibx-1.0b3b/jibx-run.jar
! cp=$cp:$XSD2JIBX_HOME/lib/jibx-1.0b3b/xpp3.jar
  cp=$cp:$XSD2JIBX_HOME/lib/log4j-1.2.8/log4j-1.2.8.jar
  
--- 16,21 ----
  cp=$cp:$XSD2JIBX_HOME/build/xsd2jibx.jar
  cp=$cp:$XSD2JIBX_HOME/lib/jaxme-0.2/jaxmejs.jar
! cp=$cp:$JIBX_HOME/lib/jibx-run.jar
! cp=$cp:$JIBX_HOME/lib/xpp3.jar
  cp=$cp:$XSD2JIBX_HOME/lib/log4j-1.2.8/log4j-1.2.8.jar