svn commit: r820869 - in /cxf/branches/2.2.x-fixes: ./ 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: Fri Oct  2 02:50:49 2009
New Revision: 820869

URL: http://svn.apache.org/viewvc?rev=820869&view=rev
Log:
Merged revisions 820431 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r820431 | dkulp | 2009-09-30 16:24:10 -0400 (Wed, 30 Sep 2009) | 4 lines
  
  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/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java
    
cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java
    
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java

Propchange: cxf/branches/2.2.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java?rev=820869&r1=820868&r2=820869&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java
 Fri Oct  2 02:50:49 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/branches/2.2.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java?rev=820869&r1=820868&r2=820869&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java
 Fri Oct  2 02:50:49 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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java?rev=820869&r1=820868&r2=820869&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java
 Fri Oct  2 02:50:49 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?");
                                 }
                             }