Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 17938 invoked from network); 7 Oct 2008 18:49:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Oct 2008 18:49:15 -0000 Received: (qmail 97379 invoked by uid 500); 7 Oct 2008 18:49:14 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 97319 invoked by uid 500); 7 Oct 2008 18:49:14 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 97310 invoked by uid 99); 7 Oct 2008 18:49:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Oct 2008 11:49:14 -0700 X-ASF-Spam-Status: No, hits=-1999.9 required=10.0 tests=ALL_TRUSTED,DNS_FROM_SECURITYSAGE X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Oct 2008 18:48:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 34C4F238898A; Tue, 7 Oct 2008 11:48:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r702582 - in /cxf/branches/2.1.x-fixes: ./ common/common/ common/xjc/dv-test/ common/xjc/ts-test/ maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ parent/ rt/bindings/soap/ rt/databinding/aegis/src/main/java/org/apach... Date: Tue, 07 Oct 2008 18:48:23 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081007184824.34C4F238898A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Oct 7 11:48:22 2008 New Revision: 702582 URL: http://svn.apache.org/viewvc?rev=702582&view=rev Log: Merged revisions 702580 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r702580 | dkulp | 2008-10-07 14:45:12 -0400 (Tue, 07 Oct 2008) | 2 lines Progressing toward getting things building/testing with the IBM 1.5 JDK on Linux and AIX ........ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/common/common/pom.xml cxf/branches/2.1.x-fixes/common/xjc/dv-test/pom.xml cxf/branches/2.1.x-fixes/common/xjc/ts-test/pom.xml cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java cxf/branches/2.1.x-fixes/parent/pom.xml cxf/branches/2.1.x-fixes/rt/bindings/soap/pom.xml cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java cxf/branches/2.1.x-fixes/rt/frontend/jaxws/pom.xml cxf/branches/2.1.x-fixes/rt/transports/jms/pom.xml cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 7 11:48:22 2008 @@ -1 +1 @@ -/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,702267,702547,702561 +/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,702267,702547,702561,702580 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/common/common/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/pom.xml?rev=702582&r1=702581&r2=702582&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/common/pom.xml (original) +++ cxf/branches/2.1.x-fixes/common/common/pom.xml Tue Oct 7 11:48:22 2008 @@ -101,12 +101,12 @@ org.apache.ws.commons.schema XmlSchema - + commons-lang commons-lang - + log4j log4j @@ -121,7 +121,7 @@ provided - + org.codehaus.woodstox wstx-asl @@ -147,8 +147,8 @@ org.apache.geronimo.specs geronimo-ws-metadata_2.0_spec test - - + + @@ -156,4 +156,24 @@ scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/common/common + + + ibmjdk + + + java.vendor + IBM Corporation + + + + + com.sun.xml.parsers + jaxp-ri + 1.4.2 + test + + + + + Modified: cxf/branches/2.1.x-fixes/common/xjc/dv-test/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/xjc/dv-test/pom.xml?rev=702582&r1=702581&r2=702582&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/xjc/dv-test/pom.xml (original) +++ cxf/branches/2.1.x-fixes/common/xjc/dv-test/pom.xml Tue Oct 7 11:48:22 2008 @@ -82,22 +82,36 @@ - com.sun.tools.xjc.maven2 - maven-jaxb-plugin + org.codehaus.mojo + jaxb2-maven-plugin + 1.2 - - ${basedir}/target/generated/src/test/java - ${basedir}/src/test/resources/schemas/configuration - *.xsd - true - -Xdv - - generate + xjc + + ${basedir}/target/generated/src/test/java + ${basedir}/src/test/resources/schemas/configuration + -Xdv + true + true + + + + + org.apache.cxf + cxf-xjc-dv + ${project.version} + + + org.apache.cxf + cxf-xjc-ts + ${project.version} + + Modified: cxf/branches/2.1.x-fixes/common/xjc/ts-test/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/xjc/ts-test/pom.xml?rev=702582&r1=702581&r2=702582&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/xjc/ts-test/pom.xml (original) +++ cxf/branches/2.1.x-fixes/common/xjc/ts-test/pom.xml Tue Oct 7 11:48:22 2008 @@ -80,22 +80,36 @@ - com.sun.tools.xjc.maven2 - maven-jaxb-plugin + org.codehaus.mojo + jaxb2-maven-plugin + 1.2 - - ${basedir}/target/generated/src/test/java - ${basedir}/src/test/resources/schemas/configuration - *.xsd - true - -Xts - - generate + xjc + + ${basedir}/target/generated/src/test/java + ${basedir}/src/test/resources/schemas/configuration + -Xts + true + true + + + + + org.apache.cxf + cxf-xjc-dv + ${project.version} + + + org.apache.cxf + cxf-xjc-ts + ${project.version} + + Modified: cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java?rev=702582&r1=702581&r2=702582&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java (original) +++ cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java Tue Oct 7 11:48:22 2008 @@ -30,7 +30,8 @@ * this horrid inital value to tell if it has been * configured or not yet. */ - private static final String DEFAULT_WSDL_LOCATION = "@£$%^&*()DEFAULTWSDLLOCATION"; + private static final String DEFAULT_WSDL_LOCATION = "DEFAULTWSDLLOCATION - WORKAROUND"; + protected List packagenames; protected List extraargs = new ArrayList(); protected File outputDir; Modified: cxf/branches/2.1.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=702582&r1=702581&r2=702582&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.1.x-fixes/parent/pom.xml Tue Oct 7 11:48:22 2008 @@ -155,23 +155,6 @@ - com.sun.tools.xjc.maven2 - maven-jaxb-plugin - 1.1 - - - org.apache.cxf - cxf-xjc-dv - ${project.version} - - - org.apache.cxf - cxf-xjc-ts - ${project.version} - - - - org.apache.maven.plugins maven-checkstyle-plugin 2.2 @@ -448,7 +431,11 @@ ant-nodeps 1.6.5 - + + com.sun.xml.parsers + jaxp-ri + 1.4.2 + org.apache.servicemix servicemix-jbi Modified: cxf/branches/2.1.x-fixes/rt/bindings/soap/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/soap/pom.xml?rev=702582&r1=702581&r2=702582&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/bindings/soap/pom.xml (original) +++ cxf/branches/2.1.x-fixes/rt/bindings/soap/pom.xml Tue Oct 7 11:48:22 2008 @@ -95,4 +95,22 @@ scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/rt/bindings/soap + + + ibmjdk + + + java.vendor + IBM Corporation + + + + + com.sun.xml.parsers + jaxp-ri + true + + + + Modified: cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java?rev=702582&r1=702581&r2=702582&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java (original) +++ cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java Tue Oct 7 11:48:22 2008 @@ -270,7 +270,7 @@ return false; } - private static Object getAnnotationValue(String name, + static Object getAnnotationValue(String name, AnnotatedElement element, Object ignoredValue, Class... annotations) { Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/pom.xml?rev=702582&r1=702581&r2=702582&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/pom.xml (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/pom.xml Tue Oct 7 11:48:22 2008 @@ -153,4 +153,22 @@ scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/rt/frontend/jaxws + + + ibmjdk + + + java.vendor + IBM Corporation + + + + + com.sun.xml.parsers + jaxp-ri + + + + + Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/pom.xml?rev=702582&r1=702581&r2=702582&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/transports/jms/pom.xml (original) +++ cxf/branches/2.1.x-fixes/rt/transports/jms/pom.xml Tue Oct 7 11:48:22 2008 @@ -72,12 +72,6 @@ - ${saaj.impl.groupId} - ${saaj.impl.artifactId} - runtime - - - org.apache.geronimo.specs geronimo-j2ee-management_1.1_spec test Modified: cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml?rev=702582&r1=702581&r2=702582&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml (original) +++ cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml Tue Oct 7 11:48:22 2008 @@ -153,4 +153,24 @@ scm:svn:http://svn.apache.org/repos/asf/cxf/trunk/rt/ws/security scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/rt/ws/security + + + + ibmjdk + + + java.vendor + IBM Corporation + + + + + com.sun.xml.parsers + jaxp-ri + test + + + + + Modified: cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?rev=702582&r1=702581&r2=702582&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java (original) +++ cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java Tue Oct 7 11:48:22 2008 @@ -392,13 +392,13 @@ vResults.addWarning(warningMsg); } - @SuppressWarnings("unchecked") private void collectValidationPoints() throws Exception { if (services.size() == 0) { LOG.log(Level.WARNING, "WSDL document " + this.definition.getDocumentBaseURI() + " does not define any services"); //addWarning("WSDL document does not define any services"); - portTypeRefNames.addAll(this.definition.getAllPortTypes().keySet()); + Collection ports = CastUtils.cast(this.definition.getAllPortTypes().keySet()); + portTypeRefNames.addAll(ports); } else { collectValidationPointsForBindings(); } Modified: cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java?rev=702582&r1=702581&r2=702582&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java (original) +++ cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java Tue Oct 7 11:48:22 2008 @@ -38,6 +38,7 @@ import org.apache.cxf.common.util.CollectionUtils; import org.apache.cxf.common.util.StringUtils; +import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.WSDLHelper; import org.apache.cxf.tools.common.ToolException; import org.apache.cxf.tools.common.extensions.soap.SoapBody; @@ -358,7 +359,6 @@ } // TODO: Should also check SoapHeader/SoapHeaderFault - @SuppressWarnings("unchecked") public boolean checkR2205() { for (Iterator ite = def.getBindings().values().iterator(); ite.hasNext();) { Binding binding = (Binding)ite.next(); @@ -371,14 +371,14 @@ for (Iterator ite2 = binding.getPortType().getOperations().iterator(); ite2.hasNext();) { Operation operation = (Operation)ite2.next(); - Collection faults = operation.getFaults().values(); + Collection faults = CastUtils.cast(operation.getFaults().values()); if (CollectionUtils.isEmpty(faults)) { continue; } for (Fault fault : faults) { Message message = fault.getMessage(); - Collection parts = message.getParts().values(); + Collection parts = CastUtils.cast(message.getParts().values()); for (Part part : parts) { if (part.getElementName() == null) { addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2205") + "In Message "