Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 44108 invoked from network); 21 Apr 2007 01:25:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Apr 2007 01:25:18 -0000 Received: (qmail 48525 invoked by uid 500); 21 Apr 2007 01:25:24 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 48423 invoked by uid 500); 21 Apr 2007 01:25:24 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 48410 invoked by uid 99); 21 Apr 2007 01:25:24 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Apr 2007 18:25:24 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Apr 2007 18:25:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D7D5F1A9838; Fri, 20 Apr 2007 18:24:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r530964 - in /incubator/cxf/trunk: buildtools/ buildtools/src/main/resources/ buildtools/src/main/resources/META-INF/ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ Date: Sat, 21 Apr 2007 01:24:55 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070421012455.D7D5F1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Apr 20 18:24:54 2007 New Revision: 530964 URL: http://svn.apache.org/viewvc?view=rev&rev=530964 Log: Workaround bug in maven thats preventing proper NOTICE file stuff from being generated. In jaxb databinding, if using non-jaxb pojos, put types in same namespace as service. Added: incubator/cxf/trunk/buildtools/src/main/resources/META-INF/ incubator/cxf/trunk/buildtools/src/main/resources/META-INF/DISCLAIMER.txt (with props) incubator/cxf/trunk/buildtools/src/main/resources/META-INF/LICENSE (with props) incubator/cxf/trunk/buildtools/src/main/resources/META-INF/NOTICE (with props) Modified: incubator/cxf/trunk/buildtools/pom.xml incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Modified: incubator/cxf/trunk/buildtools/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/pom.xml?view=diff&rev=530964&r1=530963&r2=530964 ============================================================================== --- incubator/cxf/trunk/buildtools/pom.xml (original) +++ incubator/cxf/trunk/buildtools/pom.xml Fri Apr 20 18:24:54 2007 @@ -35,78 +35,86 @@ true - + - - - asm - asm-all - 20070324 - true - - - jdom - jdom - 1.0 - true - - - org.codehaus.plexus - plexus-utils - 1.4.1 - true - - - org.apache.maven - maven-plugin-api - 2.0.5 - true - - - org.apache.maven - maven-model - 2.0.5 - true - - - org.apache.maven - maven-project - 2.0.5 - true - - - org.codehaus.mojo - shade-maven-plugin - 1.0-alpha-6 - true - - - - + + + asm + asm-all + 20070324 + true + + + jdom + jdom + 1.0 + true + + + org.codehaus.plexus + plexus-utils + 1.4.1 + true + + + org.apache.maven + maven-plugin-api + 2.0.5 + true + + + org.apache.maven + maven-model + 2.0.5 + true + + + org.apache.maven + maven-project + 2.0.5 + true + + + org.codehaus.mojo + shade-maven-plugin + 1.0-alpha-6 + true + + + + scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/buildtools Added: incubator/cxf/trunk/buildtools/src/main/resources/META-INF/DISCLAIMER.txt URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/META-INF/DISCLAIMER.txt?view=auto&rev=530964 ============================================================================== --- incubator/cxf/trunk/buildtools/src/main/resources/META-INF/DISCLAIMER.txt (added) +++ incubator/cxf/trunk/buildtools/src/main/resources/META-INF/DISCLAIMER.txt Fri Apr 20 18:24:54 2007 @@ -0,0 +1,10 @@ +${project.name} is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. Propchange: incubator/cxf/trunk/buildtools/src/main/resources/META-INF/DISCLAIMER.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/buildtools/src/main/resources/META-INF/DISCLAIMER.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/cxf/trunk/buildtools/src/main/resources/META-INF/LICENSE URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/META-INF/LICENSE?view=auto&rev=530964 ============================================================================== --- incubator/cxf/trunk/buildtools/src/main/resources/META-INF/LICENSE (added) +++ incubator/cxf/trunk/buildtools/src/main/resources/META-INF/LICENSE Fri Apr 20 18:24:54 2007 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Propchange: incubator/cxf/trunk/buildtools/src/main/resources/META-INF/LICENSE ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/buildtools/src/main/resources/META-INF/LICENSE ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/cxf/trunk/buildtools/src/main/resources/META-INF/NOTICE URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/META-INF/NOTICE?view=auto&rev=530964 ============================================================================== --- incubator/cxf/trunk/buildtools/src/main/resources/META-INF/NOTICE (added) +++ incubator/cxf/trunk/buildtools/src/main/resources/META-INF/NOTICE Fri Apr 20 18:24:54 2007 @@ -0,0 +1,70 @@ +// ------------------------------------------------------------------ +// NOTICE file corresponding to the section 4d of The Apache License, +// Version 2.0, in this case for Apache CXF Buildtools +// ------------------------------------------------------------------ + +Apache CXF Buildtools +Copyright 2006-2007 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + + +This product includes/uses software, Maven Profile Model (http://maven.apache.org/maven-profile), +developed by Apache Software Foundation (http://www.apache.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software, Unnamed - junit:junit:jar:3.8.1 + +This product includes/uses software, Default Plexus Container, +developed by Codehaus (http://www.codehaus.org/) + +This product includes/uses software, Maven Project Builder (http://maven.apache.org/maven-project), +developed by Apache Software Foundation (http://www.apache.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software, Maven Local Settings Model (http://maven.apache.org/maven-settings), +developed by Apache Software Foundation (http://www.apache.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software, classworlds (http://classworlds.codehaus.org/), +developed by The Codehaus (http://codehaus.org/) + +This product includes/uses software, Plexus Common Utilities, +developed by Codehaus (http://www.codehaus.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software, Maven Repository Metadata Model (http://maven.apache.org/maven-repository-metadata), +developed by Apache Software Foundation (http://www.apache.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software, Unnamed - jdom:jdom:jar:1.0 + +This product includes/uses software, Maven Model (http://maven.apache.org/maven-model), +developed by Apache Software Foundation (http://www.apache.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software, ASM All (http://asm.objectweb.org/asm-all), +developed by ObjectWeb (http://www.objectweb.org/) + +This product includes/uses software, Maven Artifact (http://maven.apache.org/maven-artifact), +developed by Apache Software Foundation (http://www.apache.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software, Maven Artifact Manager (http://maven.apache.org/maven-artifact-manager), +developed by Apache Software Foundation (http://www.apache.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software, Maven Plugin API (http://maven.apache.org/maven-plugin-api), +developed by Apache Software Foundation (http://www.apache.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software, shade-maven-plugin (http://mojo.codehaus.org/shade-maven-plugin), +developed by Codehaus (http://codehaus.org) + +This product includes/uses software, Maven Wagon API (http://maven.apache.org/wagon/wagon-provider-api), +developed by Apache Software Foundation (http://www.apache.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + + + Propchange: incubator/cxf/trunk/buildtools/src/main/resources/META-INF/NOTICE ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/buildtools/src/main/resources/META-INF/NOTICE ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml?view=diff&rev=530964&r1=530963&r2=530964 ============================================================================== --- incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml (original) +++ incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml Fri Apr 20 18:24:54 2007 @@ -86,7 +86,7 @@ xalan Apache Xalan-Java - Apache Software Foundation + The Apache Software Foundation http://www.apache.org @@ -110,7 +110,7 @@ wss4j Apache WSS4J - Apache Software Foundation + The Apache Software Foundation http://www.apache.org @@ -144,7 +144,7 @@ xmlsec XML Security - Apache Software Foundation + The Apache Software Foundation http://www.apache.org @@ -161,7 +161,7 @@ xml-apis XML APIs - Apache Software Foundation + The Apache Software Foundation http://www.apache.org @@ -185,6 +185,40 @@ Bouncy Castle License http://www.bouncycastle.org/licence.html + + + + + + + ant + ant + Apache Ant + + The Apache Software Foundation + http://www.apache.org + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + + ant + ant-nodeps + Apache Ant (nodeps) + + The Apache Software Foundation + http://www.apache.org + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?view=diff&rev=530964&r1=530963&r2=530964 ============================================================================== --- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original) +++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Fri Apr 20 18:24:54 2007 @@ -249,7 +249,7 @@ } try { - setContext(createJAXBContext(classes)); + setContext(createJAXBContext(classes, service.getName().getNamespaceURI())); } catch (JAXBException e1) { throw new ServiceConstructionException(e1); } @@ -337,8 +337,12 @@ } - public static JAXBContext createJAXBContext(Set> classes) throws JAXBException { + return createJAXBContext(classes, null); + } + + public static JAXBContext createJAXBContext(Set> classes, + String defaultNs) throws JAXBException { Iterator it = classes.iterator(); String className = ""; Object remoteExceptionObject = null; @@ -350,6 +354,13 @@ } } + for (Class cls : classes) { + if (cls.getName().endsWith("ObjectFactory")) { + //kind of a hack, but ObjectFactories may be created with empty namespaces + defaultNs = null; + } + } + try { classes.add(Class.forName("org.apache.cxf.ws.addressing.wsdl.AttributedQNameType")); classes.add(Class.forName("org.apache.cxf.ws.addressing.wsdl.ObjectFactory")); @@ -360,7 +371,12 @@ // context? } - return JAXBContext.newInstance(classes.toArray(new Class[classes.size()])); + Map map = new HashMap(); + if (defaultNs != null) { + map.put("com.sun.xml.bind.defaultNamespaceRemap", defaultNs); + } + + return JAXBContext.newInstance(classes.toArray(new Class[classes.size()]), map); } }