Author: dkulp Date: Fri Jul 24 14:04:15 2009 New Revision: 797464 URL: http://svn.apache.org/viewvc?rev=797464&view=rev Log: Merged revisions 797442 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk
........ r797442 | dkulp | 2009-07-24 09:31:23 -0400 (Fri, 24 Jul 2009) | 2 lines Add a xjc plugin to workaround https://jaxb.dev.java.net/issues/show_bug.cgi?id=671 ........ Added: cxf/branches/2.2.x-fixes/common/xjc/bug671/ - copied from r797442, cxf/trunk/common/xjc/bug671/ cxf/branches/2.2.x-fixes/common/xjc/bug671/pom.xml - copied unchanged from r797442, cxf/trunk/common/xjc/bug671/pom.xml cxf/branches/2.2.x-fixes/common/xjc/bug671/src/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/com/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/com/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/com/sun/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/com/sun/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/com/sun/tools/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/com/sun/tools/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/com/sun/tools/xjc/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/com/sun/tools/xjc/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/com/sun/tools/xjc/addon/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/com/sun/tools/xjc/addon/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/com/sun/tools/xjc/addon/apache_cxf/bug671/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/com/sun/tools/xjc/addon/apache_cxf/bug671/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/com/sun/tools/xjc/addon/apache_cxf/bug671/Bug671Plugin.java - copied unchanged from r797442, cxf/trunk/common/xjc/bug671/src/main/java/com/sun/tools/xjc/addon/apache_cxf/bug671/Bug671Plugin.java cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/org/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/org/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/org/apache/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/org/apache/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/org/apache/cxf/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/org/apache/cxf/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/org/apache/cxf/xjc/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/org/apache/cxf/xjc/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/org/apache/cxf/xjc/bug671/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/java/org/apache/cxf/xjc/bug671/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/java/org/apache/cxf/xjc/bug671/Bug671Plugin.java - copied unchanged from r797442, cxf/trunk/common/xjc/bug671/src/main/java/org/apache/cxf/xjc/bug671/Bug671Plugin.java cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/resources/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/resources/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/resources/META-INF/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/resources/META-INF/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/resources/META-INF/services/ - copied from r797442, cxf/trunk/common/xjc/bug671/src/main/resources/META-INF/services/ cxf/branches/2.2.x-fixes/common/xjc/bug671/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin - copied unchanged from r797442, cxf/trunk/common/xjc/bug671/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/common/xjc/pom.xml cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml cxf/branches/2.2.x-fixes/distribution/pom.xml Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 24 14:04:15 2009 @@ -1 +1 @@ -/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233 +/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/common/xjc/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/xjc/pom.xml?rev=797464&r1=797463&r2=797464&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/common/xjc/pom.xml (original) +++ cxf/branches/2.2.x-fixes/common/xjc/pom.xml Fri Jul 24 14:04:15 2009 @@ -35,6 +35,7 @@ <modules> <module>dv</module> <module>ts</module> + <module>bug671</module> <module>dv-test</module> <module>ts-test</module> </modules> Modified: cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml?rev=797464&r1=797463&r2=797464&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml Fri Jul 24 14:04:15 2009 @@ -102,6 +102,12 @@ <version>${pom.version}</version> </dependency> <dependency> + <groupId>${pom.groupId}.xjcplugins</groupId> + <artifactId>cxf-xjc-bug671</artifactId> + <version>${pom.version}</version> + </dependency> + + <dependency> <groupId>${pom.groupId}</groupId> <artifactId>cxf-xjc-dv</artifactId> <version>${pom.version}</version> Modified: cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml?rev=797464&r1=797463&r2=797464&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml Fri Jul 24 14:04:15 2009 @@ -108,7 +108,11 @@ <artifactId>cxf-xjc-ts</artifactId> <version>${pom.version}</version> </dependency> - + <dependency> + <groupId>${pom.groupId}.xjcplugins</groupId> + <artifactId>cxf-xjc-bug671</artifactId> + <version>${pom.version}</version> + </dependency> <dependency> <groupId>${pom.groupId}</groupId> <artifactId>cxf-api</artifactId> Modified: cxf/branches/2.2.x-fixes/distribution/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/pom.xml?rev=797464&r1=797463&r2=797464&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/pom.xml Fri Jul 24 14:04:15 2009 @@ -113,7 +113,11 @@ <artifactId>cxf-xjc-ts</artifactId> <version>${pom.version}</version> </dependency> - + <dependency> + <groupId>${pom.groupId}.xjcplugins</groupId> + <artifactId>cxf-xjc-bug671</artifactId> + <version>${pom.version}</version> + </dependency> <dependency> <groupId>${pom.groupId}</groupId> <artifactId>cxf-api</artifactId>
