Changeset 34388 in osm for applications/editors


Ignore:
Timestamp:
2018-07-01T13:53:18+02:00 (6 years ago)
Author:
donvip
Message:

see #josm15560, see #josm16047 - add JAF 1.2.0 from ​https://github.com/javaee/activation/releases/tag/JAF-1_2_0

Location:
applications/editors/josm/plugins/00_tools/jaxb-ri
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/00_tools/jaxb-ri/bin/schemagen.bat

    r34377 r34388  
    6767:SETCLASSPATH
    6868if "%CLASSPATH%" == "" goto NOUSERCLASSPATH
    69 set LOCALCLASSPATH=%JAXB_HOME%\lib\jaxb-core.jar;%JAXB_HOME%\lib\jaxb-xjc.jar;%JAXB_HOME%\lib\jaxb-jxc.jar;%JAXB_HOME%\lib\jaxb-impl.jar;%CLASSPATH%
     69set LOCALCLASSPATH=%JAXB_HOME%\lib\jaxb-core.jar;%JAXB_HOME%\lib\jaxb-xjc.jar;%JAXB_HOME%\lib\jaxb-jxc.jar;%JAXB_HOME%\lib\jaxb-impl.jar;%JAXB_HOME%\lib\javax.activation.jar;%CLASSPATH%
    7070goto LAUNCHSCHEMAGEN
    7171
    7272:NOUSERCLASSPATH
    73 set LOCALCLASSPATH=%JAXB_HOME%\lib\jaxb-core.jar;%JAXB_HOME%\lib\jaxb-xjc.jar;%JAXB_HOME%\lib\jaxb-jxc.jar;%JAXB_HOME%\lib\jaxb-impl.jar
     73set LOCALCLASSPATH=%JAXB_HOME%\lib\jaxb-core.jar;%JAXB_HOME%\lib\jaxb-xjc.jar;%JAXB_HOME%\lib\jaxb-jxc.jar;%JAXB_HOME%\lib\jaxb-impl.jar;%JAXB_HOME%\lib\javax.activation.jar
    7474goto LAUNCHSCHEMAGEN
    7575

  • applications/editors/josm/plugins/00_tools/jaxb-ri/bin/schemagen.sh

    r34377 r34388  
    7979# add the api jar file
    8080if [ -z "$LOCALCLASSPATH" ] ; then
    81     LOCALCLASSPATH="$JAXB_HOME"/lib/jaxb-api.jar:"$JAXB_HOME"/lib/jaxb-core.jar:"$JAXB_HOME"/lib/jaxb-xjc.jar:"$JAXB_HOME"/lib/jaxb-jxc.jar:"$JAXB_HOME"/lib/jaxb-impl.jar
     81    LOCALCLASSPATH="$JAXB_HOME"/lib/jaxb-api.jar:"$JAXB_HOME"/lib/jaxb-core.jar:"$JAXB_HOME"/lib/jaxb-xjc.jar:"$JAXB_HOME"/lib/jaxb-jxc.jar:"$JAXB_HOME"/lib/jaxb-impl.jar:"$JAXB_HOME"/lib/javax.activation.jar
    8282else
    83     LOCALCLASSPATH="$JAXB_HOME"/lib/jaxb-api.jar:"$JAXB_HOME"/lib/jaxb-core.jar:"$JAXB_HOME"/lib/jaxb-xjc.jar:"$JAXB_HOME"/lib/jaxb-jxc.jar:"$JAXB_HOME"/lib/jaxb-impl.jar:"$LOCALCLASSPATH"
     83    LOCALCLASSPATH="$JAXB_HOME"/lib/jaxb-api.jar:"$JAXB_HOME"/lib/jaxb-core.jar:"$JAXB_HOME"/lib/jaxb-xjc.jar:"$JAXB_HOME"/lib/jaxb-jxc.jar:"$JAXB_HOME"/lib/jaxb-impl.jar:"$JAXB_HOME"/lib/javax.activation.jar:"$LOCALCLASSPATH"
    8484fi
    8585

  • applications/editors/josm/plugins/00_tools/jaxb-ri/bin/xjc.bat

    r34377 r34388  
    6666
    6767:LAUNCHXJC
    68 %JAVA% %XJC_OPTS% -jar "%JAXB_HOME%\lib\jaxb-xjc.jar" %*
     68%JAVA% %XJC_OPTS% -cp "%JAXB_HOME%\lib\javax.activation.jar" -jar "%JAXB_HOME%\lib\jaxb-xjc.jar" %*
    6969
    7070:END

  • applications/editors/josm/plugins/00_tools/jaxb-ri/bin/xjc.sh

    r34377 r34388  
    8585fi
    8686
    87 exec "$JAVA" $XJC_OPTS -jar "$JAXB_HOME/lib/jaxb-xjc.jar" "$@"
     87exec "$JAVA" $XJC_OPTS -cp "$JAXB_HOME/lib/javax.activation.jar" -jar "$JAXB_HOME/lib/jaxb-xjc.jar" "$@"
Note: See TracChangeset for help on using the changeset viewer.