1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WscompileMessages.java Thu Apr 04 19:05:24 2013 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WscompileMessages.java Tue Apr 09 14:51:13 2013 +0100
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, 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 @@ -23,12 +23,11 @@
1.11 * questions.
1.12 */
1.13
1.14 -
1.15 package com.sun.tools.internal.ws.resources;
1.16
1.17 -import com.sun.xml.internal.ws.util.localization.Localizable;
1.18 -import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
1.19 -import com.sun.xml.internal.ws.util.localization.Localizer;
1.20 +import com.sun.istack.internal.localization.Localizable;
1.21 +import com.sun.istack.internal.localization.LocalizableMessageFactory;
1.22 +import com.sun.istack.internal.localization.Localizer;
1.23
1.24
1.25 /**
1.26 @@ -213,7 +212,7 @@
1.27 }
1.28
1.29 /**
1.30 - * You are running on JDK6 which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} API. Use the endorsed standards override mechanism (http://java.sun.com/javase/6/docs/technotes/guides/standards/), or use -Xendorsed option.
1.31 + * You are running on JDK6 which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} API. Use the endorsed standards override mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), or use -Xendorsed option.
1.32 *
1.33 */
1.34 public static String INVOKER_NEED_ENDORSED(Object arg0, Object arg1) {
1.35 @@ -331,7 +330,8 @@
1.36 * result in applications that are not portable or
1.37 * may not interoperate with other implementations
1.38 * -help display help
1.39 - * -httpproxy:<host>:<port> specify a HTTP proxy server (port defaults to 8080)
1.40 + * -httpproxy:<proxy> set a HTTP proxy. Format is [user[:password]@]proxyHost:proxyPort
1.41 + * (port defaults to 8080)
1.42 * -keep keep generated files
1.43 * -p <pkg> specifies the target package
1.44 * -quiet suppress wsimport output
1.45 @@ -568,7 +568,7 @@
1.46 }
1.47
1.48 /**
1.49 - * You are running on JDK6 which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} API. Use the endorsed standards override mechanism (http://java.sun.com/javase/6/docs/technotes/guides/standards/), or set xendorsed="true" on <{2}>.
1.50 + * You are running on JDK6 which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} API. Use the endorsed standards override mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), or set xendorsed="true" on <{2}>.
1.51 *
1.52 */
1.53 public static String WRAPPER_TASK_NEED_ENDORSED(Object arg0, Object arg1, Object arg2) {
1.54 @@ -910,6 +910,18 @@
1.55 return localizer.localize(localizableWSIMPORT_ILLEGAL_TARGET_VERSION(arg0));
1.56 }
1.57
1.58 + public static Localizable localizableWSIMPORT_ILLEGAL_PROXY(Object arg0) {
1.59 + return messageFactory.getMessage("wsimport.ILLEGAL_PROXY", arg0);
1.60 + }
1.61 +
1.62 + /**
1.63 + * "{0}" is not a valid proxy format. The format is [user[:password]@]proxyHost:proxyPort
1.64 + *
1.65 + */
1.66 + public static String WSIMPORT_ILLEGAL_PROXY(Object arg0) {
1.67 + return localizer.localize(localizableWSIMPORT_ILLEGAL_PROXY(arg0));
1.68 + }
1.69 +
1.70 public static Localizable localizableWSGEN_PORTNAME_MISSING_LOCALNAME(Object arg0) {
1.71 return messageFactory.getMessage("wsgen.portname.missing.localname", arg0);
1.72 }
