1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile.properties Thu Apr 04 19:05:24 2013 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile.properties Tue Apr 09 14:51:13 2013 +0100
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -40,7 +40,8 @@
1.11 \ result in applications that are not portable or\n\
1.12 \ may not interoperate with other implementations\n\
1.13 \ -help display help\n\
1.14 -\ -httpproxy:<host>:<port> specify a HTTP proxy server (port defaults to 8080)\n\
1.15 +\ -httpproxy:<proxy> set a HTTP proxy. Format is [user[:password]@]proxyHost:proxyPort\n\
1.16 +\ (port defaults to 8080)\n\
1.17 \ -keep keep generated files\n\
1.18 \ -p <pkg> specifies the target package\n\
1.19 \ -quiet suppress wsimport output\n\
1.20 @@ -133,7 +134,7 @@
1.21
1.22 wrapperTask.needEndorsed=\
1.23 You are running on JDK6 which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} API. \
1.24 -Use the endorsed standards override mechanism (http://java.sun.com/javase/6/docs/technotes/guides/standards/), \
1.25 +Use the endorsed standards override mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), \
1.26 or set xendorsed="true" on <{2}>.
1.27
1.28 # {0}, {2} - version (e.g. 2.1), {1} - absolute class location
1.29 @@ -142,7 +143,7 @@
1.30
1.31 invoker.needEndorsed=\
1.32 You are running on JDK6 which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} API. \
1.33 -Use the endorsed standards override mechanism (http://java.sun.com/javase/6/docs/technotes/guides/standards/), \
1.34 +Use the endorsed standards override mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), \
1.35 or use -Xendorsed option.
1.36
1.37
1.38 @@ -205,6 +206,9 @@
1.39 wsimport.ILLEGAL_AUTH_INFO = \
1.40 "{0}" is not a valid authorization information format. The format is http[s]://user:password@host:port//<url-path>.
1.41
1.42 +wsimport.ILLEGAL_PROXY = \
1.43 + "{0}" is not a valid proxy format. The format is [user[:password]@]proxyHost:proxyPort
1.44 +
1.45 wsimport.readingAuthFile = \
1.46 Trying to read authorization file : "{0}"...
1.47
