Merge

Tue, 22 Oct 2013 16:10:31 -0700

author
katleman
date
Tue, 22 Oct 2013 16:10:31 -0700
changeset 431
f20820d1582f
parent 429
be7d1f874b96
parent 430
17f1b13cd401
child 432
9261f342aa73

Merge

     1.1 --- a/makefiles/BuildJaxws.gmk	Thu Oct 17 16:12:58 2013 -0700
     1.2 +++ b/makefiles/BuildJaxws.gmk	Tue Oct 22 16:10:31 2013 -0700
     1.3 @@ -57,7 +57,7 @@
     1.4      COPY_FILES := $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \
     1.5          $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \
     1.6          $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml, \
     1.7 -    ADD_JAVAC_FLAGS = -cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar))
     1.8 +    ADD_JAVAC_FLAGS = -Xbootclasspath/p:$(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar))
     1.9  
    1.10  $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \
    1.11      $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin

mercurial