svn commit: r820431 - in /cxf/trunk: common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/

[dkulp]

Author: dkulp
Date: Wed Sep 30 20:24:10 2009
New Revision: 820431

URL: http://svn.apache.org/viewvc?rev=820431&view=rev
Log:
Fix error message typo
Make sure the -Xts plugin is added to the activePlugins.  When run with
params, it's not always added (thanks to TheDon on irc for discovering
this)

Modified:
    
cxf/trunk/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java
    
cxf/trunk/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java

Modified: 
cxf/trunk/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java?rev=820431&r1=820430&r2=820431&view=diff
==============================================================================
--- 
cxf/trunk/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java
 (original)
+++ 
cxf/trunk/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java
 Wed Sep 30 20:24:10 2009
@@ -69,6 +69,6 @@
     public int parseArgument(Options opt, String[] args, int index) 
         throws BadCommandLineException, IOException {
         
-        return impl.parseArgument(opt, args, index);
+        return impl.parseArgument(opt, args, index, this);
     }
 }

Modified: 
cxf/trunk/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java?rev=820431&r1=820430&r2=820431&view=diff
==============================================================================
--- 
cxf/trunk/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java 
(original)
+++ 
cxf/trunk/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java 
Wed Sep 30 20:24:10 2009
@@ -61,7 +61,7 @@
             +  "  -Xts:style:simple    : Have toString produce single line 
terse output\n";
     }
 
-    public int parseArgument(Options opt, String[] args, int index) 
+    public int parseArgument(Options opt, String[] args, int index, 
com.sun.tools.xjc.Plugin plugin) 
         throws BadCommandLineException, IOException {
         int ret = 0;
         if (args[index].equals("-Xts:style:multiline")) {
@@ -71,6 +71,9 @@
             styleFieldName = "SIMPLE_STYLE";
             ret = 1;
         }
+        if (!opt.activePlugins.contains(plugin)) {
+            opt.activePlugins.add(plugin);
+        }
         return ret;
     }
     

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java?rev=820431&r1=820430&r2=820431&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
 Wed Sep 30 20:24:10 2009
@@ -117,7 +117,7 @@
                                     || info.getLocalCertificates().length == 
0) {
                                     throw new 
UntrustedURLConnectionIOException(
                                         "RequireClientCertificate is set, "
-                                        + "but no local certificates we 
negotiated.  Is"
+                                        + "but no local certificates were 
negotiated.  Is"
                                         + " the server set to ask for client 
authorization?");
                                 }
                             }