Author: richard.opalka(a)jboss.com Date: 2010-08-06 03:41:54 -0400 (Fri, 06 Aug 2010) New Revision: 12748 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java Log: [CXF-2926] Unify catalog feature behaviour for all three supported SOAP stacks - just print warning Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2010-08-05 17:31:41 UTC (rev 12747) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2010-08-06 07:41:54 UTC (rev 12748) @@ -209,7 +209,16 @@ if (wsdlLocation != null) consumer.setWsdlLocation(wsdlLocation); if (catalog != null) - consumer.setCatalog(catalog); + { + if (catalog.exists() && catalog.isFile()) + { + consumer.setCatalog(catalog); + } + else + { + log("Catalog file not found: " + catalog, Project.MSG_WARN); + } + } if (bindingFiles != null && bindingFiles.size() > 0) consumer.setBindingFiles(bindingFiles); if (target != null) Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2010-08-05 17:31:41 UTC (rev 12747) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2010-08-06 07:41:54 UTC (rev 12748) @@ -236,7 +236,16 @@ } if (catalog != null) - consumer.setCatalog(catalog); + { + if (catalog.exists() && catalog.isFile()) + { + consumer.setCatalog(catalog); + } + else + { + System.err.println("Warning: catalog file not found: " + catalog); + } + } if (targetPackage != null) consumer.setTargetPackage(targetPackage);