Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 717F4D02C for ; Fri, 29 Jun 2012 18:43:46 +0000 (UTC) Received: (qmail 54052 invoked by uid 500); 29 Jun 2012 18:43:46 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 54008 invoked by uid 500); 29 Jun 2012 18:43:46 -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 53999 invoked by uid 99); 29 Jun 2012 18:43:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jun 2012 18:43:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Fri, 29 Jun 2012 18:43:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7C45A2388A3D; Fri, 29 Jun 2012 18:43:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1355504 - in /cxf/trunk/tools/javato/ws/src: main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/ main/java/org/apache/cxf/tools/java2wsdl/processor/ test/java/org/apache/cxf/tools/java2ws/ test/java/org/apache/cxf/tools/java2wsdl/ge... Date: Fri, 29 Jun 2012 18:43:19 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120629184321.7C45A2388A3D@eris.apache.org> Author: dkulp Date: Fri Jun 29 18:43:17 2012 New Revision: 1355504 URL: http://svn.apache.org/viewvc?rev=1355504&view=rev Log: [CXF-4152] fix test failures due to m2e work Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java?rev=1355504&r1=1355503&r2=1355504&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java (original) +++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java Fri Jun 29 18:43:17 2012 @@ -143,6 +143,7 @@ public class WSDL11Generator extends Abs generator.setServiceModel(getServiceModel()); generator.setAllowImports(allowImports()); generator.addSchemaFiles(imports); + generator.setToolContext(getToolContext()); generator.generate(outputdir); } Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java?rev=1355504&r1=1355503&r2=1355504&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java (original) +++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java Fri Jun 29 18:43:17 2012 @@ -150,6 +150,7 @@ public class JavaToWSDLProcessor impleme public void generate(ServiceInfo service, File output) throws ToolException { for (AbstractGenerator generator : generators) { + generator.setToolContext(context); generator.setServiceModel(service); generator.setBus(getBus()); generator.generate(output); Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java?rev=1355504&r1=1355503&r2=1355504&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java (original) +++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java Fri Jun 29 18:43:17 2012 @@ -83,7 +83,7 @@ public class JavaToWSTest extends ToolTe @Test public void testCXF2941() throws Exception { String[] args = new String[] { - "-wsdl", "-wrapperbean", + "-wsdl", "-wrapperbean", "-s", output.getPath(), "-o", output.getPath() + "/cxf2941.wsdl", org.apache.cxf.tools.fortest.cxf2941.WebResultService.class.getName() @@ -377,6 +377,7 @@ public class JavaToWSTest extends ToolTe ClassLoader loader = getClass().getClassLoader(); StringBuffer classPath = new StringBuffer(); if (loader instanceof URLClassLoader) { + @SuppressWarnings("resource") URLClassLoader urlLoader = (URLClassLoader)loader; for (URL url : urlLoader.getURLs()) { File file; Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java?rev=1355504&r1=1355503&r2=1355504&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java (original) +++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java Fri Jun 29 18:43:17 2012 @@ -42,6 +42,7 @@ public class DateTypeCustomGeneratorTest @Before public void setUp() throws Exception { processor.setEnvironment(env); + gen.setToolContext(env); } @After Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java?rev=1355504&r1=1355503&r2=1355504&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java (original) +++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java Fri Jun 29 18:43:17 2012 @@ -60,6 +60,7 @@ public class FaultBeanGeneratorTest exte env.put(ToolConstants.CFG_CLASSNAME, testingClass); FaultBeanGenerator generator = new FaultBeanGenerator(); + generator.setToolContext(env); generator.setServiceModel(getServiceInfo()); generator.generate(output); @@ -80,7 +81,7 @@ public class FaultBeanGeneratorTest exte FaultBeanGenerator generator = new FaultBeanGenerator(); generator.setServiceModel(getServiceInfo()); - + generator.setToolContext(env); generator.generate(output); String pkgBase = "org/apache/cxf/tools/fortest/jaxws/rpc/types"; Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java?rev=1355504&r1=1355503&r2=1355504&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java (original) +++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java Fri Jun 29 18:43:17 2012 @@ -69,6 +69,7 @@ public class WrapperBeanGeneratorTest ex env.put(ToolConstants.CFG_CLASSNAME, testingClass); WrapperBeanGenerator generator = new WrapperBeanGenerator(); + generator.setToolContext(env); generator.setServiceModel(getServiceInfo()); generator.generate(output); @@ -94,6 +95,7 @@ public class WrapperBeanGeneratorTest ex env.put(ToolConstants.CFG_CLASSNAME, testingClass); WrapperBeanGenerator generator = new WrapperBeanGenerator(); + generator.setToolContext(env); generator.setServiceModel(getServiceInfo()); generator.generate(output); @@ -128,6 +130,7 @@ public class WrapperBeanGeneratorTest ex env.put(ToolConstants.CFG_CLASSNAME, testingClass); WrapperBeanGenerator generator = new WrapperBeanGenerator(); + generator.setToolContext(env); generator.setServiceModel(getServiceInfo()); generator.generate(output); @@ -143,6 +146,7 @@ public class WrapperBeanGeneratorTest ex env.put(ToolConstants.CFG_CLASSNAME, testingClass); WrapperBeanGenerator generator = new WrapperBeanGenerator(); + generator.setToolContext(env); generator.setServiceModel(getServiceInfo()); generator.generate(output); Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java?rev=1355504&r1=1355503&r2=1355504&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java (original) +++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java Fri Jun 29 18:43:17 2012 @@ -41,6 +41,7 @@ public class JaxwsServiceBuilderNoAnnoTe JAXBContextCache.clearCaches(); builder.setBus(BusFactory.getDefaultBus()); generator.setBus(builder.getBus()); + generator.setToolContext(env); } Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java?rev=1355504&r1=1355503&r2=1355504&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java (original) +++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java Fri Jun 29 18:43:17 2012 @@ -39,6 +39,7 @@ public class JaxwsServiceBuilderRPCTest JAXBContextCache.clearCaches(); builder.setBus(BusFactory.getDefaultBus()); generator.setBus(builder.getBus()); + generator.setToolContext(env); } @org.junit.After Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java?rev=1355504&r1=1355503&r2=1355504&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java (original) +++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java Fri Jun 29 18:43:17 2012 @@ -34,6 +34,7 @@ import org.apache.cxf.jaxws.JaxwsService import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.ServiceInfo; import org.apache.cxf.tools.common.ProcessorTestBase; +import org.apache.cxf.tools.common.ToolContext; import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator; import org.apache.cxf.tools.util.AnnotationUtil; import org.apache.cxf.transport.DestinationFactoryManager; @@ -53,6 +54,7 @@ public class JaxwsServiceBuilderTest ext builder = new JaxwsServiceBuilder(); builder.setBus(BusFactory.getDefaultBus()); generator.setBus(builder.getBus()); + generator.setToolContext(new ToolContext()); Bus b = builder.getBus(); assertNotNull(b.getExtension(DestinationFactoryManager.class)