Author: rmeggins Update of /cvs/dirsec/dsmlgw/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20508/dsmlgw/scripts Modified Files: dsml2ldif.in dsmlgw-search.in ldif2dsml.in Log Message: Resolves: bug 449178 Bug Description: Hard-coded java path limitting the installation flexibility Reviewed by: nhosoi (Thanks!) Fix Description: Allow the user to specify JAVA_HOME to override the default javahome location. Platforms tested: RHEL5 Flag Day: no Doc impact: no Index: dsml2ldif.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/dsml2ldif.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dsml2ldif.in 30 Apr 2008 20:49:22 -0000 1.2 +++ dsml2ldif.in 11 Jun 2008 21:06:58 -0000 1.3 @@ -25,7 +25,7 @@ # END COPYRIGHT BLOCK # -CP=@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/dsmlgw.jar:@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/ldapjdk.jar +CP="@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/dsmlgw.jar:@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/ldapjdk.jar" # it seems that most java 1.5 and later JREs already have a built-in sax implementation # if you need to specify another one, just specify the SAXJARS env var # SAXJARS=/path/to/xml-parser.jar dsml2ldif file.dsml @@ -33,4 +33,8 @@ CP=${CP}:$SAXJARS fi -@runtime_javahome@/bin/java -cp "$CP" com.netscape.xmltools.DSML2LDIF "$@" +DEFAULT_JAVAHOME="@runtime_javahome@" + +JAVA_HOME="${JAVA_HOME:-$DEFAULT_JAVAHOME}" + +"$JAVA_HOME/bin/java" -cp "$CP" com.netscape.xmltools.DSML2LDIF "$@" Index: dsmlgw-search.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/dsmlgw-search.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dsmlgw-search.in 30 Apr 2008 20:49:22 -0000 1.3 +++ dsmlgw-search.in 11 Jun 2008 21:06:58 -0000 1.4 @@ -99,6 +99,10 @@ fi done -@runtime_javahome@/bin/java -cp "$AXISCP" com.netscape.dsml.test.dsmlSearch http://$hostname:$port/axis/services/dsmlgw $tmpdsml +DEFAULT_JAVAHOME="@runtime_javahome@" + +JAVA_HOME="${JAVA_HOME:-$DEFAULT_JAVAHOME}" + +"$JAVA_HOME/bin/java" -cp "$AXISCP" com.netscape.dsml.test.dsmlSearch http://$hostname:$port/axis/services/dsmlgw $tmpdsml rm -f $tmpdsml Index: ldif2dsml.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/ldif2dsml.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ldif2dsml.in 30 Apr 2008 20:49:22 -0000 1.2 +++ ldif2dsml.in 11 Jun 2008 21:06:58 -0000 1.3 @@ -25,7 +25,7 @@ # END COPYRIGHT BLOCK # -CP=@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/dsmlgw.jar:@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/ldapjdk.jar +CP="@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/dsmlgw.jar:@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/ldapjdk.jar" # it seems that most java 1.5 and later JREs already have a built-in sax implementation # if you need to specify another one, just specify the SAXJARS env var # SAXJARS=/path/to/xml-parser.jar dsml2ldif file.dsml @@ -33,4 +33,8 @@ CP=${CP}:$SAXJARS fi -@runtime_javahome@/bin/java -cp "$CP" com.netscape.xmltools.LDIF2DSML "$@" +DEFAULT_JAVAHOME="@runtime_javahome@" + +JAVA_HOME="${JAVA_HOME:-$DEFAULT_JAVAHOME}" + +"$JAVA_HOME/bin/java" -cp "$CP" com.netscape.xmltools.LDIF2DSML "$@"