Author: thomas.diesler(a)jboss.com Date: 2007-08-04 09:52:52 -0400 (Sat, 04 Aug 2007) New Revision: 4204 Modified: stack/cxf/trunk/build.bat stack/cxf/trunk/build.sh Log: Always use ant/endorsed Modified: stack/cxf/trunk/build.bat =================================================================== --- stack/cxf/trunk/build.bat 2007-08-04 13:52:48 UTC (rev 4203) +++ stack/cxf/trunk/build.bat 2007-08-04 13:52:52 UTC (rev 4204) @@ -7,8 +7,6 @@ REM Users should be sure to execute this file rather than 'ant' to ensure REM the correct version is being used with the correct configuration. REM -REM NOTE: Uncomment the USE_JDK6 property when using JDK 1.6 -REM REM ====================================================================== REM REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ @@ -29,12 +27,6 @@ set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat -REM ****************************************************** -REM JDK 6 Settings -REM Uncomment when using JDK 6 -REM ****************************************************** -REM set USE_JDK6=true - REM REM - "for" loops have been unrolled for compatibility REM with some WIN32 systems. Modified: stack/cxf/trunk/build.sh =================================================================== --- stack/cxf/trunk/build.sh 2007-08-04 13:52:48 UTC (rev 4203) +++ stack/cxf/trunk/build.sh 2007-08-04 13:52:52 UTC (rev 4204) @@ -20,9 +20,6 @@ # Ignore user's ANT_HOME if it is set ANT_HOME="" -# Uncomment when using JDK 6 -#USE_JDK6=true - # the default search path for ant ANT_SEARCH_PATH="tools/ant" @@ -148,12 +145,8 @@ # Set the max memory to 256m ANT_OPTS=-Xmx256m - if [ "x$USE_JDK6" = "xtrue" ]; then - ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" - echo "--------------------------------------" - echo "Endorsed Directory: $ANT_HOME/endorsed" - echo "--------------------------------------" - fi + # Endorse JAXB, JAXWS API + ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" # setup some build properties ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"