You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2019/05/16 21:19:18 UTC
[cxf] branch master updated: [CXF-8044] Don't set the Compiler-fork
setting. It shouldn't be needed and interferes with folks that have it
explicitely set to false.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 5c4d446 [CXF-8044] Don't set the Compiler-fork setting. It shouldn't be needed and interferes with folks that have it explicitely set to false.
5c4d446 is described below
commit 5c4d446b66597dde2bf70e8971112547273bbf29
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Thu May 16 16:39:11 2019 -0400
[CXF-8044] Don't set the Compiler-fork setting. It shouldn't be needed and interferes with folks that have it explicitely set to false.
---
.../java/org/apache/cxf/common/util/Compiler.java | 2 +-
.../cxf/endpoint/dynamic/DynamicClientFactory.java | 3 ---
.../cxf/systest/aegis/AegisClientServerTest.java | 4 ----
.../org/apache/cxf/systest/jaxws/CXF5061Test.java | 4 ----
.../cxf/systest/jaxws/ClientServerMiscTest.java | 4 ----
.../cxf/systest/jaxws/JaxWsDynamicClientTest.java | 9 ---------
.../apache/cxf/tools/common/ProcessorTestBase.java | 9 ---------
.../java2wsdl/generator/wsdl11/BeanGenerator.java | 2 +-
.../java2js/processor/JavaToJSProcessorTest.java | 3 ---
.../generator/wsdl11/FaultBeanGeneratorTest.java | 19 ++-----------------
.../generator/wsdl11/WrapperBeanGeneratorTest.java | 3 ---
.../java2wsdl/processor/JavaToProcessorTest.java | 4 ----
.../apache/cxf/tools/wsdlto/AbstractCodeGenTest.java | 4 ----
13 files changed, 4 insertions(+), 66 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/common/util/Compiler.java b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
index 97f38dd..569a034 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Compiler.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
@@ -104,7 +104,7 @@ public class Compiler {
if (StringUtils.isEmpty(classPath)) {
String javaClasspath = SystemPropertyAction.getProperty("java.class.path");
- boolean classpathSetted = javaClasspath != null ? true : false;
+ boolean classpathSetted = !StringUtils.isEmpty(javaClasspath);
if (!classpathSetted) {
File f = new File(getClass().getClassLoader().getResource(".").getFile());
f = new File(f, "../lib");
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index c842fc7..fc68b65 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -623,9 +623,6 @@ public class DynamicClientFactory {
}
protected boolean compileJavaSrc(String classPath, List<File> srcList, String dest) {
- if (JavaUtils.isJava9Compatible()) {
- System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
- }
org.apache.cxf.common.util.Compiler javaCompiler
= new org.apache.cxf.common.util.Compiler();
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
index ecad231..005672f 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.endpoint.dynamic.DynamicClientFactory;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
-import org.apache.cxf.helpers.JavaUtils;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.systest.aegis.SportsService.Pair;
@@ -262,9 +261,6 @@ public class AegisClientServerTest extends AbstractBusClientServerTestBase {
@Test
public void testDynamicClient() throws Exception {
- if (JavaUtils.isJava9Compatible()) {
- System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
- }
DynamicClientFactory dcf = DynamicClientFactory.newInstance();
Client client = dcf.createClient("http://localhost:" + PORT + "/jaxwsAndAegisSports?wsdl&dynamic");
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java
index 560ad47..9c8a8e0 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java
@@ -22,7 +22,6 @@ package org.apache.cxf.systest.jaxws;
import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.helpers.JavaUtils;
import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
@@ -65,9 +64,6 @@ public class CXF5061Test extends AbstractBusClientServerTestBase {
@Test
public void testCxf5061() throws Exception {
- if (JavaUtils.isJava9Compatible()) {
- System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
- }
//using dcf to generate client from the wsdl which ensure the wsdl is valid
JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
dcf.createClient(ADDRESS + "?wsdl");
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
index 27aa391..78807ea 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
@@ -62,7 +62,6 @@ import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.helpers.JavaUtils;
import org.apache.cxf.helpers.XPathUtils;
import org.apache.cxf.jaxb_element_test.JaxbElementTest;
import org.apache.cxf.jaxb_element_test.JaxbElementTest_Service;
@@ -899,9 +898,6 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
@Test
public void testDynamicClientExceptions() throws Exception {
- if (JavaUtils.isJava9Compatible()) {
- System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
- }
JaxWsDynamicClientFactory dcf =
JaxWsDynamicClientFactory.newInstance();
URL wsdlURL = new URL(ServerMisc.DOCLIT_CODEFIRST_URL + "?wsdl");
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
index 0c94b0f..d820499 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
@@ -30,14 +30,12 @@ import org.apache.cxf.endpoint.ClientCallback;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.helpers.JavaUtils;
import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
import org.apache.cxf.no_body_parts.types.Operation1;
import org.apache.cxf.no_body_parts.types.Operation1Response;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.TestUtil;
-import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -66,13 +64,6 @@ public class JaxWsDynamicClientTest extends AbstractBusClientServerTestBase {
return hexString.toString();
}
- @Before
- public void setUp() throws Exception {
- if (JavaUtils.isJava9Compatible()) {
- System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
- }
- }
-
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
index 1f77aef..005acb7 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
@@ -45,12 +45,10 @@ import javax.xml.namespace.QName;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.FileUtils;
-import org.apache.cxf.helpers.JavaUtils;
import org.apache.cxf.tools.util.ToolsStaxUtils;
import org.apache.ws.commons.schema.constants.Constants;
import org.junit.After;
-import org.junit.Before;
import org.junit.ComparisonFailure;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
@@ -96,13 +94,6 @@ public class ProcessorTestBase {
a.add(local);
}
- @Before
- public void setUp() throws Exception {
- if (JavaUtils.isJava9Compatible()) {
- System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
- }
- }
-
@After
public void tearDown() {
env = null;
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java
index 1c7996d..15f8b48 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java
@@ -81,7 +81,7 @@ public class BeanGenerator extends AbstractGenerator<File> {
generator.clearAttributes();
}
- //compile the classes
+ //compile the classes
Compiler compiler = (Compiler)getToolContext().get(ToolConstants.COMPILER);
if (compiler == null) {
compiler = new Compiler();
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java
index ced20aa..7dfeb89 100755
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java
@@ -46,9 +46,6 @@ public class JavaToJSProcessorTest extends ProcessorTestBase {
env = new ToolContext();
classPath = System.getProperty("java.class.path");
System.setProperty("java.class.path", getClassPath());
- if (JavaUtils.isJava9Compatible()) {
- System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
- }
}
@After
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
index 90b814d..fb51530 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
@@ -25,13 +25,11 @@ import java.net.URI;
import java.util.HashSet;
import java.util.Set;
-import org.apache.cxf.helpers.JavaUtils;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.java2wsdl.processor.JavaToWSDLProcessor;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -41,26 +39,11 @@ import static org.junit.Assert.assertTrue;
public class FaultBeanGeneratorTest extends ProcessorTestBase {
JavaToWSDLProcessor processor = new JavaToWSDLProcessor();
- String classPath = "";
@Before
public void setUp() throws Exception {
- classPath = System.getProperty("java.class.path");
- System.setProperty("java.class.path", getClassPath());
- if (JavaUtils.isJava9Compatible()) {
- System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
- String java9PlusFolder = output.getParent() + java.io.File.separator + "java9";
- System.setProperty("java.class.path", System.getProperty("java.class.path")
- + java.io.File.pathSeparator + java9PlusFolder + java.io.File.separator + "*");
- }
processor.setEnvironment(env);
}
- @After
- public void tearDown() {
- super.tearDown();
- System.setProperty("java.class.path", classPath);
- }
-
private ServiceInfo getServiceInfo() {
return processor.getServiceBuilder().createService();
}
@@ -77,6 +60,7 @@ public class FaultBeanGeneratorTest extends ProcessorTestBase {
generator.generate(output);
String pkgBase = "org/apache/cxf/tools/fortest/cxf523/jaxws";
+
assertEquals(2, new File(output, pkgBase).listFiles().length);
File faultBeanClass = new File(output, pkgBase + "/DBServiceFaultBean.java");
assertTrue(faultBeanClass.exists());
@@ -89,6 +73,7 @@ public class FaultBeanGeneratorTest extends ProcessorTestBase {
public void testGenFaultBeanWithCustomization() throws Exception {
String testingClass = "org.apache.cxf.tools.fortest.jaxws.rpc.GreeterFault";
env.put(ToolConstants.CFG_CLASSNAME, testingClass);
+ env.put(ToolConstants.CFG_VERBOSE, Boolean.TRUE);
FaultBeanGenerator generator = new FaultBeanGenerator();
generator.setServiceModel(getServiceInfo());
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
index 20c60a6..5c31d4e 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
@@ -61,9 +61,6 @@ public class WrapperBeanGeneratorTest extends ProcessorTestBase {
@Before
public void setUp() throws Exception {
processor.setEnvironment(env);
- if (JavaUtils.isJava9Compatible()) {
- System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
- }
}
private ServiceInfo getServiceInfo() {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
index 404911c..755095c 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
@@ -84,10 +84,6 @@ public class JavaToProcessorTest extends ProcessorTestBase {
classPath = System.getProperty("java.class.path");
System.setProperty("java.class.path", getClassPath());
- if (JavaUtils.isJava9Compatible()) {
- System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
- }
-
}
@After
public void tearDown() {
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java
index d2d72e6..848e732 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java
@@ -22,7 +22,6 @@ import java.io.File;
import java.net.URL;
import java.net.URLClassLoader;
-import org.apache.cxf.helpers.JavaUtils;
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
@@ -64,9 +63,6 @@ public abstract class AbstractCodeGenTest extends ProcessorTestBase {
@Before
public void setUp() throws Exception {
processor = new JAXWSContainer(null);
- if (JavaUtils.isJava9Compatible()) {
- System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
- }
}
@After