Author: dkulp Date: Mon Jun 8 19:52:53 2009 New Revision: 782750 URL: http://svn.apache.org/viewvc?rev=782750&view=rev Log: Merged revisions 782733 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r782733 | dkulp | 2009-06-08 15:23:05 -0400 (Mon, 08 Jun 2009) | 10 lines 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.1.x-fixes/common/xjc/dv/src/main/java/com/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/ cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/java/com/sun/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/ cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/ cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/ cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/ cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/apache_cxf/dv/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/apache_cxf/dv/ cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/apache_cxf/dv/DefaultValuePlugin.java - copied unchanged from r782733, cxf/branches/2.2.x-fixes/common/xjc/dv/src/main/java/com/sun/tools/xjc/addon/apache_cxf/dv/DefaultValuePlugin.java cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/ cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/sun/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/ cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/ cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/ cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/ cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ - copied from r782733, cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java - copied unchanged from r782733, cxf/branches/2.2.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 8 19:52:53 2009 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841 -/cxf/trunk:782181 +/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733 +/cxf/trunk:782181,782728 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java?rev=782750&r1=782749&r2=782750&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java (original) +++ cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java Mon Jun 8 19:52:53 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.1.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.1.x-fixes/common/xjc/dv/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin?rev=782750&r1=782749&r2=782750&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin (original) +++ cxf/branches/2.1.x-fixes/common/xjc/dv/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin Mon Jun 8 19:52:53 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.1.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java?rev=782750&r1=782749&r2=782750&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java (original) +++ cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java Mon Jun 8 19:52:53 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.1.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.1.x-fixes/common/xjc/ts/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin?rev=782750&r1=782749&r2=782750&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin (original) +++ cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin Mon Jun 8 19:52:53 2009 @@ -1 +1 @@ -org.apache.cxf.xjc.ts.ToStringPlugin \ No newline at end of file +com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin
