Author: dkulp Date: Wed Oct 8 07:33:56 2008 New Revision: 702892 URL: http://svn.apache.org/viewvc?rev=702892&view=rev Log: Merged revisions 702582 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r702582 | dkulp | 2008-10-07 14:48:22 -0400 (Tue, 07 Oct 2008) | 9 lines 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.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/common/common/pom.xml cxf/branches/2.0.x-fixes/common/xjc/dv-test/pom.xml cxf/branches/2.0.x-fixes/common/xjc/ts-test/pom.xml cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java cxf/branches/2.0.x-fixes/parent/pom.xml cxf/branches/2.0.x-fixes/rt/bindings/soap/pom.xml cxf/branches/2.0.x-fixes/rt/frontend/jaxws/pom.xml cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 8 07:33:56 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702604,702610 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,702267,702602,702609 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,702267,702580,702602,702609 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/common/common/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/pom.xml?rev=702892&r1=702891&r2=702892&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/common/common/pom.xml (original) +++ cxf/branches/2.0.x-fixes/common/common/pom.xml Wed Oct 8 07:33:56 2008 @@ -106,12 +106,12 @@ <groupId>org.apache.ws.commons.schema</groupId> <artifactId>XmlSchema</artifactId> </dependency> - + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> - + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -126,7 +126,7 @@ <scope>provided</scope> </dependency> - + <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> @@ -148,7 +148,11 @@ <artifactId>geronimo-activation_1.1_spec</artifactId> <scope>test</scope> </dependency> - + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-ws-metadata_2.0_spec</artifactId> + <scope>test</scope> + </dependency> </dependencies> <scm> @@ -156,4 +160,24 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/branches/2.0.x-fixes/common/common</developerConnection> </scm> + <profiles> + <profile> + <id>ibmjdk</id> + <activation> + <property> + <name>java.vendor</name> + <value>IBM Corporation</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.xml.parsers</groupId> + <artifactId>jaxp-ri</artifactId> + <version>1.4.2</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> + </project> Modified: cxf/branches/2.0.x-fixes/common/xjc/dv-test/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/xjc/dv-test/pom.xml?rev=702892&r1=702891&r2=702892&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/common/xjc/dv-test/pom.xml (original) +++ cxf/branches/2.0.x-fixes/common/xjc/dv-test/pom.xml Wed Oct 8 07:33:56 2008 @@ -82,22 +82,36 @@ <build> <plugins> <plugin> - <groupId>com.sun.tools.xjc.maven2</groupId> - <artifactId>maven-jaxb-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> + <version>1.2</version> <executions> <execution> - <configuration> - <generateDirectory>${basedir}/target/generated/src/test/java</generateDirectory> - <schemaDirectory>${basedir}/src/test/resources/schemas/configuration</schemaDirectory> - <includeSchema>*.xsd</includeSchema> - <extension>true</extension> - <args>-Xdv</args> - </configuration> <goals> - <goal>generate</goal> + <goal>xjc</goal> </goals> </execution> </executions> + <configuration> + <outputDirectory>${basedir}/target/generated/src/test/java</outputDirectory> + <schemaDirectory>${basedir}/src/test/resources/schemas/configuration</schemaDirectory> + <arguments>-Xdv</arguments> + <extension>true</extension> + <quiet>true</quiet> + </configuration> + + <dependencies> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-xjc-dv</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-xjc-ts</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> </build> Modified: cxf/branches/2.0.x-fixes/common/xjc/ts-test/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/xjc/ts-test/pom.xml?rev=702892&r1=702891&r2=702892&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/common/xjc/ts-test/pom.xml (original) +++ cxf/branches/2.0.x-fixes/common/xjc/ts-test/pom.xml Wed Oct 8 07:33:56 2008 @@ -80,22 +80,36 @@ <build> <plugins> <plugin> - <groupId>com.sun.tools.xjc.maven2</groupId> - <artifactId>maven-jaxb-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> + <version>1.2</version> <executions> <execution> - <configuration> - <generateDirectory>${basedir}/target/generated/src/test/java</generateDirectory> - <schemaDirectory>${basedir}/src/test/resources/schemas/configuration</schemaDirectory> - <includeSchema>*.xsd</includeSchema> - <extension>true</extension> - <args>-Xts</args> - </configuration> <goals> - <goal>generate</goal> + <goal>xjc</goal> </goals> </execution> </executions> + <configuration> + <outputDirectory>${basedir}/target/generated/src/test/java</outputDirectory> + <schemaDirectory>${basedir}/src/test/resources/schemas/configuration</schemaDirectory> + <arguments>-Xts</arguments> + <extension>true</extension> + <quiet>true</quiet> + </configuration> + + <dependencies> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-xjc-dv</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-xjc-ts</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> </build> Modified: cxf/branches/2.0.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.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java?rev=702892&r1=702891&r2=702892&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java (original) +++ cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java Wed Oct 8 07:33:56 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<String> packagenames; protected List<String> extraargs = new ArrayList<String>(); protected File outputDir; Modified: cxf/branches/2.0.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=702892&r1=702891&r2=702892&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.0.x-fixes/parent/pom.xml Wed Oct 8 07:33:56 2008 @@ -124,23 +124,6 @@ <pluginManagement> <plugins> <plugin> - <groupId>com.sun.tools.xjc.maven2</groupId> - <artifactId>maven-jaxb-plugin</artifactId> - <version>1.1</version> - <dependencies> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-xjc-dv</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-xjc-ts</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <dependencies> @@ -388,7 +371,11 @@ <artifactId>ant-nodeps</artifactId> <version>1.6.5</version> </dependency> - + <dependency> + <groupId>com.sun.xml.parsers</groupId> + <artifactId>jaxp-ri</artifactId> + <version>1.4.2</version> + </dependency> <dependency> <groupId>org.apache.servicemix</groupId> <artifactId>servicemix-jbi</artifactId> Modified: cxf/branches/2.0.x-fixes/rt/bindings/soap/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/pom.xml?rev=702892&r1=702891&r2=702892&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/bindings/soap/pom.xml (original) +++ cxf/branches/2.0.x-fixes/rt/bindings/soap/pom.xml Wed Oct 8 07:33:56 2008 @@ -95,4 +95,22 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/branches/2.0.x-fixes/rt/bindings/soap</developerConnection> </scm> + <profiles> + <profile> + <id>ibmjdk</id> + <activation> + <property> + <name>java.vendor</name> + <value>IBM Corporation</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.xml.parsers</groupId> + <artifactId>jaxp-ri</artifactId> + <optional>true</optional> + </dependency> + </dependencies> + </profile> + </profiles> </project> Modified: cxf/branches/2.0.x-fixes/rt/frontend/jaxws/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/pom.xml?rev=702892&r1=702891&r2=702892&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/pom.xml (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/pom.xml Wed Oct 8 07:33:56 2008 @@ -147,4 +147,22 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/branches/2.0.x-fixes/rt/frontend/jaxws</developerConnection> </scm> + <profiles> + <profile> + <id>ibmjdk</id> + <activation> + <property> + <name>java.vendor</name> + <value>IBM Corporation</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.xml.parsers</groupId> + <artifactId>jaxp-ri</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> + </project> Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml?rev=702892&r1=702891&r2=702892&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml Wed Oct 8 07:33:56 2008 @@ -72,12 +72,6 @@ </dependency> <dependency> - <groupId>${saaj.impl.groupId}</groupId> - <artifactId>${saaj.impl.artifactId}</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee-management_1.1_spec</artifactId> <scope>test</scope> Modified: cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml?rev=702892&r1=702891&r2=702892&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml (original) +++ cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml Wed Oct 8 07:33:56 2008 @@ -154,4 +154,24 @@ <connection>scm:svn:http://svn.apache.org/repos/asf/cxf/branches/2.0.x-fixes/rt/ws/security</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/branches/2.0.x-fixes/rt/ws/security</developerConnection> </scm> + + <profiles> + <profile> + <id>ibmjdk</id> + <activation> + <property> + <name>java.vendor</name> + <value>IBM Corporation</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.xml.parsers</groupId> + <artifactId>jaxp-ri</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> + </project> Modified: cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?rev=702892&r1=702891&r2=702892&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java (original) +++ cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java Wed Oct 8 07:33:56 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<QName> ports = CastUtils.cast(this.definition.getAllPortTypes().keySet()); + portTypeRefNames.addAll(ports); } else { collectValidationPointsForBindings(); } Modified: cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java?rev=702892&r1=702891&r2=702892&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java (original) +++ cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java Wed Oct 8 07:33:56 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<Fault> faults = operation.getFaults().values(); + Collection<Fault> faults = CastUtils.cast(operation.getFaults().values()); if (CollectionUtils.isEmpty(faults)) { continue; } for (Fault fault : faults) { Message message = fault.getMessage(); - Collection<Part> parts = message.getParts().values(); + Collection<Part> parts = CastUtils.cast(message.getParts().values()); for (Part part : parts) { if (part.getElementName() == null) { addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2205") + "In Message "
