Fix module path for xjc/schemagen .bat files

Signed-off-by: Roman Grigoriadi <roman.grigoriadi@oracle.com>
eclipse-ee4j · Jan 2, 2019 · d64d08d · d64d08d
1 parent 6f51ad9
commit d64d08d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/jaxb-ri/bundles/ri/src/main/resources/bin/schemagen.bat b/jaxb-ri/bundles/ri/src/main/resources/bin/schemagen.bat
@@ -24,14 +24,14 @@ if not "%JAXB_HOME%" == "" goto SETCLASSPATH
 rem Try to locate JAXB_HOME
 set JAXB_HOME=%~dp0
 set JAXB_HOME=%JAXB_HOME%\..
-if exist %JAXB_HOME%\lib\jaxb-xjc.jar goto SETCLASSPATH
+if exist %JAXB_HOME%\mod\jaxb-xjc.jar goto SETCLASSPATH
 
 rem Unable to find it
 echo JAXB_HOME must be set before running this script
 goto END
 
 :SETCLASSPATH
-set JAXB_PATH=%JAXB_HOME%/mod/jakarta.xml.bind-api.jar;%JAXB_HOME%/mod/jaxb-jxc.jar;%JAXB_HOME%/mod/jaxb-xjc.jar;%JAXB_HOME%/mod/jaxb-runtime.jar;%JAXB_HOME%/mod/stax-ex.jar;%JAXB_HOME%/mod/istack-commons-runtime.jar;%JAXB_HOME%/mod/istack-commons-tools.jar;%JAXB_HOME%/mod/FastInfoset.jar;%JAXB_HOME%/mod/dtd-parser.jar;%JAXB_HOME%/mod/rngom.jar;%JAXB_HOME%/mod/codemodel.jar;%JAXB_HOME%/mod/xsom.jar;%JAXB_HOME%/mod/txw2.jar;%JAXB_HOME%/lib/relaxngDatatype.jar;%JAXB_HOME%/mod/jakarta.activation-api.jar
+set JAXB_PATH=%JAXB_HOME%/mod/jakarta.xml.bind-api.jar;%JAXB_HOME%/mod/jaxb-jxc.jar;%JAXB_HOME%/mod/jaxb-xjc.jar;%JAXB_HOME%/mod/jaxb-runtime.jar;%JAXB_HOME%/mod/stax-ex.jar;%JAXB_HOME%/mod/istack-commons-runtime.jar;%JAXB_HOME%/mod/istack-commons-tools.jar;%JAXB_HOME%/mod/FastInfoset.jar;%JAXB_HOME%/mod/dtd-parser.jar;%JAXB_HOME%/mod/rngom.jar;%JAXB_HOME%/mod/codemodel.jar;%JAXB_HOME%/mod/xsom.jar;%JAXB_HOME%/mod/txw2.jar;%JAXB_HOME%/mod/relaxng-datatype.jar;%JAXB_HOME%/mod/jakarta.activation-api.jar
 
 if "%CLASSPATH%" == "" goto NOUSERCLASSPATH
 set LOCALCLASSPATH=%JAXB_PATH%;%CLASSPATH%

diff --git a/jaxb-ri/bundles/ri/src/main/resources/bin/xjc.bat b/jaxb-ri/bundles/ri/src/main/resources/bin/xjc.bat
@@ -24,7 +24,7 @@ if not "%JAXB_HOME%" == "" goto CHECKJAVAHOME
 rem Try to locate JAXB_HOME
 set JAXB_HOME=%~dp0
 set JAXB_HOME=%JAXB_HOME%\..
-if exist "%JAXB_HOME%\lib\jaxb-xjc.jar" goto CHECKJAVAHOME
+if exist "%JAXB_HOME%\mod\jaxb-xjc.jar" goto CHECKJAVAHOME
 
 rem Unable to find it
 echo JAXB_HOME must be set before running this script
@@ -42,7 +42,7 @@ goto LAUNCHXJC
 
 :LAUNCHXJC
 rem JXC module path
-set JAXB_PATH=%JAXB_HOME%/mod/jaxb-xjc.jar;%JAXB_HOME%/mod/jakarta.xml.bind-api.jar;%JAXB_HOME%/mod/codemodel.jar;%JAXB_HOME%/mod/jaxb-runtime.jar;%JAXB_HOME%/mod/istack-commons-runtime.jar;%JAXB_HOME%/mod/istack-commons-tools.jar;%JAXB_HOME%/mod/rngom.jar;%JAXB_HOME%/mod/xsom.jar;%JAXB_HOME%/mod/dtd-parser.jar;%JAXB_HOME%/mod/txw2.jar;%JAXB_HOME%/mod/stax-ex.jar;%JAXB_HOME%/mod/FastInfoset.jar;%JAXB_HOME%/mod/jakarta.activation-api.jar;%JAXB_HOME%/lib/relaxngDatatype.jar
+set JAXB_PATH=%JAXB_HOME%/mod/jaxb-xjc.jar;%JAXB_HOME%/mod/jakarta.xml.bind-api.jar;%JAXB_HOME%/mod/codemodel.jar;%JAXB_HOME%/mod/jaxb-runtime.jar;%JAXB_HOME%/mod/istack-commons-runtime.jar;%JAXB_HOME%/mod/istack-commons-tools.jar;%JAXB_HOME%/mod/rngom.jar;%JAXB_HOME%/mod/xsom.jar;%JAXB_HOME%/mod/dtd-parser.jar;%JAXB_HOME%/mod/txw2.jar;%JAXB_HOME%/mod/stax-ex.jar;%JAXB_HOME%/mod/FastInfoset.jar;%JAXB_HOME%/mod/jakarta.activation-api.jar;%JAXB_HOME%/mod/relaxng-datatype.jar
 
 rem Set Java Version
 for /f "tokens=3" %%i in ('java -version 2^>^&1 ^| %SystemRoot%\system32\find.exe "version"') do (