cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r782733 - in /cxf/branches/2.2.x-fixes: ./ common/common/src/main/resources/ common/xjc/dv/src/main/java/com/ common/xjc/dv/src/main/java/com/sun/ common/xjc/dv/src/main/java/com/sun/tools/ common/xjc/dv/src/main/java/com/sun/tools/xjc/ com...
Date Mon, 08 Jun 2009 19:23:06 GMT
Author: dkulp
Date: Mon Jun  8 19:23:05 2009
New Revision: 782733

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

........
  r782728 | dkulp | 2009-06-08 15:16:35 -0400 (Mon, 08 Jun 2009) | 2 lines
  
  [CXF-1880] Patch from Chris McClelland applied to make CXF xjc plugins
  work better with jdk6
........

Added:
    cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/
      - copied from r782728, cxf/trunk/common/xjc/dv/src/main/java/com/
    cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/
      - copied from r782728, cxf/trunk/common/xjc/dv/src/main/java/com/sun/
    cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/
      - copied from r782728, cxf/trunk/common/xjc/dv/src/main/java/com/sun/tools/
    cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/
      - copied from r782728, cxf/trunk/common/xjc/dv/src/main/java/com/sun/tools/xjc/
    cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/
      - copied from r782728, cxf/trunk/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/
    cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/apache_cxf/
      - copied from r782728, cxf/trunk/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/apache_cxf/
    cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/apache_cxf/dv/
      - copied from r782728, cxf/trunk/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/apache_cxf/dv/
    cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/apache_cxf/dv/DefaultValuePlugin.java
      - copied unchanged from r782728, cxf/trunk/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/apache_cxf/dv/DefaultValuePlugin.java
    cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/
      - copied from r782728, cxf/trunk/common/xjc/ts/src/main/java/com/
    cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/
      - copied from r782728, cxf/trunk/common/xjc/ts/src/main/java/com/sun/
    cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/
      - copied from r782728, cxf/trunk/common/xjc/ts/src/main/java/com/sun/tools/
    cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/
      - copied from r782728, cxf/trunk/common/xjc/ts/src/main/java/com/sun/tools/xjc/
    cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/
      - copied from r782728, cxf/trunk/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/
    cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/
      - copied from r782728, cxf/trunk/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/
    cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/
      - copied from r782728, cxf/trunk/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/
    cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java
      - copied unchanged from r782728, cxf/trunk/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/common/common/src/main/resources/   (props changed)
    cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
    cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
    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/common/xjc/ts/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
    cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/
  (props changed)
    cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/server/PingServiceImpl.java
  (props changed)
    cxf/branches/2.2.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/   (props changed)
    cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
  (props changed)
    cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
  (props changed)
    cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java
  (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
  (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
  (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP11Constants.java
  (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP12Constants.java
  (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java
  (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/
  (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Trust13Builder.java
  (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/
  (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
  (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
  (props changed)
    cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java
  (props changed)
    cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
  (props changed)
    cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
  (props changed)
    cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/   (props changed)

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:782728

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun  8 19:23:05 2009
@@ -1 +1 @@
-/cxf/trunk:1-782619
+/cxf/trunk:1-782619,782728

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

Modified: cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java?rev=782733&r1=782732&r2=782733&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
(original)
+++ cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
Mon Jun  8 19:23:05 2009
@@ -41,7 +41,6 @@
 import com.sun.codemodel.JOp;
 import com.sun.codemodel.JType;
 import com.sun.tools.xjc.Options;
-import com.sun.tools.xjc.Plugin;
 import com.sun.tools.xjc.outline.ClassOutline;
 import com.sun.tools.xjc.outline.FieldOutline;
 import com.sun.tools.xjc.outline.Outline;
@@ -60,7 +59,7 @@
  * Modifies the JAXB code model to initialise fields mapped from schema elements 
  * with their default value.
  */
-public class DefaultValuePlugin extends Plugin {
+public class DefaultValuePlugin {
     
     private static final Logger LOG = LogUtils.getL7dLogger(DefaultValuePlugin.class);
     

Modified: cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin?rev=782733&r1=782732&r2=782733&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
(original)
+++ cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
Mon Jun  8 19:23:05 2009
@@ -1 +1 @@
-org.apache.cxf.xjc.dv.DefaultValuePlugin
\ No newline at end of file
+com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin

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=782733&r1=782732&r2=782733&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
Mon Jun  8 19:23:05 2009
@@ -34,7 +34,6 @@
 import com.sun.codemodel.JMod;
 import com.sun.tools.xjc.BadCommandLineException;
 import com.sun.tools.xjc.Options;
-import com.sun.tools.xjc.Plugin;
 import com.sun.tools.xjc.outline.ClassOutline;
 import com.sun.tools.xjc.outline.Outline;
 
@@ -47,7 +46,7 @@
  * Modifies the JAXB code model to override the Object.toString() method with an 
  * implementation that provides a String representation of the xml content.
  */
-public class ToStringPlugin extends Plugin {
+public class ToStringPlugin {
     
     private static final Logger LOG = LogUtils.getL7dLogger(ToStringPlugin.class);
 

Modified: cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin?rev=782733&r1=782732&r2=782733&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
(original)
+++ cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
Mon Jun  8 19:23:05 2009
@@ -1 +1 @@
-org.apache.cxf.xjc.ts.ToStringPlugin
\ No newline at end of file
+com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin

Propchange: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/server/PingServiceImpl.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP11Constants.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP12Constants.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Trust13Builder.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/
            ('svn:mergeinfo' removed)



Mime
View raw message