cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1355546 - in /cxf/branches/2.6.x-fixes/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/too...
Date Fri, 29 Jun 2012 20:09:29 GMT
Author: dkulp
Date: Fri Jun 29 20:09:27 2012
New Revision: 1355546

URL: http://svn.apache.org/viewvc?rev=1355546&view=rev
Log:
Merged revisions 1355504 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1355504 | dkulp | 2012-06-29 14:43:17 -0400 (Fri, 29 Jun 2012) | 2 lines

  [CXF-4152] fix test failures due to m2e work

........

Modified:
    cxf/branches/2.6.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
    cxf/branches/2.6.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
    cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
    cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
    cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
    cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
    cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
    cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
    cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java

Modified: cxf/branches/2.6.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java?rev=1355546&r1=1355545&r2=1355546&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
Fri Jun 29 20:09:27 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/branches/2.6.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java?rev=1355546&r1=1355545&r2=1355546&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
Fri Jun 29 20:09:27 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/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java?rev=1355546&r1=1355545&r2=1355546&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
Fri Jun 29 20:09:27 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/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java?rev=1355546&r1=1355545&r2=1355546&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
Fri Jun 29 20:09:27 2012
@@ -42,6 +42,7 @@ public class DateTypeCustomGeneratorTest
     @Before
     public void setUp() throws Exception {
         processor.setEnvironment(env);
+        gen.setToolContext(env);
     }
 
     @After

Modified: cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java?rev=1355546&r1=1355545&r2=1355546&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
Fri Jun 29 20:09:27 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/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java?rev=1355546&r1=1355545&r2=1355546&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
Fri Jun 29 20:09:27 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/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java?rev=1355546&r1=1355545&r2=1355546&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
Fri Jun 29 20:09:27 2012
@@ -41,6 +41,7 @@ public class JaxwsServiceBuilderNoAnnoTe
         JAXBContextCache.clearCaches();
         builder.setBus(BusFactory.getDefaultBus());
         generator.setBus(builder.getBus());
+        generator.setToolContext(env);
     }
 
 

Modified: cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java?rev=1355546&r1=1355545&r2=1355546&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
Fri Jun 29 20:09:27 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/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java?rev=1355546&r1=1355545&r2=1355546&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
Fri Jun 29 20:09:27 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)



Mime
View raw message