[jbossws-commits] JBossWS SVN: r16580 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools and 1 other directory.

Author: alessio.soldano(a)jboss.com Date: 2012-08-06 10:37:08 -0400 (Mon, 06 Aug 2012) New Revision: 16580 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java Log: [JBPAPP-9361] WSConsume ignores target 2.1 option Merged revisions 16412 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r16412 | alessio.soldano(a)jboss.com | 2012-06-19 01:12:07 +0200 (Tue, 19 Jun 2012) | 2 lines [JBWS-3520] WSConsume ignores target 2.1 option ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16315,16323,16407-16408,16516,16530-16532 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16315,16323,16407-16408,16412,16516,16530-16532 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2012-08-06 14:36:09 UTC (rev 16579) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2012-08-06 14:37:08 UTC (rev 16580) @@ -140,6 +140,29 @@ public void consume(URL wsdl) { List<String> args = new ArrayList<String>(); + + PrintStream stream = messageStream; + boolean verbose = false; + if (stream != null) + { + verbose = true; + } + else + { + stream = NullPrintStream.getInstance(); + } + + // Always set the target + if ("2.1".equals(target)) + { + args.add("-frontend"); + args.add("jaxws21"); + } + else if (target != null && !target.equals("2.2")) + { + stream.println("Unsupported target, using default value '2.2'"); + } + if (bindingFiles != null) { for (File file : bindingFiles) @@ -194,15 +217,9 @@ args.add(wsdlLocation); } - PrintStream stream = messageStream; - if (stream != null) - { + if (verbose) { args.add("-verbose"); } - else - { - stream = NullPrintStream.getInstance(); - } if (extension) { @@ -219,13 +236,6 @@ args.add(outputDir.getAbsolutePath()); } - // Always set the target - if (target != null) - { - stream.println("WSConsume (CXF) does not allow to setup the JAX-WS specification target, using the currently " + - "configured JAX-WS version (check your JVM version and/or endorsed libs)"); - } - //Always generate wrapped style for reference element:CXF-1079 args.add("-allowElementReferences");