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 2017/03/28 01:08:03 UTC
[1/2] cxf git commit: [CXF-6976] Don't disable jar caches for tooling
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 20d0fa3ec -> 58bce070e
[CXF-6976] Don't disable jar caches for tooling
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6c77f4aa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6c77f4aa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6c77f4aa
Branch: refs/heads/3.1.x-fixes
Commit: 6c77f4aa901ce6ac648879ae2136648da4111c85
Parents: 20d0fa3
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Mar 27 17:26:39 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Mar 27 21:06:12 2017 -0400
----------------------------------------------------------------------
.../cxf/maven_plugin/AbstractCodegenMoho.java | 30 +++++++++++---------
.../cxf/tools/common/CommandInterfaceUtils.java | 1 +
.../cxf/tools/common/toolspec/ToolRunner.java | 8 ++++--
.../org/apache/cxf/tools/java2js/JavaToJS.java | 2 ++
.../org/apache/cxf/tools/java2ws/JavaToWS.java | 1 +
.../org/apache/cxf/tools/wadlto/WADLToJava.java | 2 +-
.../org/apache/cxf/tools/wsdlto/WSDLToJava.java | 3 +-
7 files changed, 29 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6c77f4aa/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index c6b28ec..72abb0b 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -202,6 +202,8 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
}
public void execute() throws MojoExecutionException {
+ System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", "true");
+
// add the generated source into compile source
// do this step first to ensure the source folder will be added to the Eclipse classpath
if (project != null && getGeneratedSourceRoot() != null) {
@@ -237,20 +239,20 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
String originalProxyUser = SystemPropertyAction.getProperty(HTTP_PROXY_USER);
String originalProxyPassword = SystemPropertyAction.getProperty(HTTP_PROXY_PASSWORD);
- configureProxyServerSettings();
-
- List<GenericWsdlOption> effectiveWsdlOptions = createWsdlOptionsFromScansAndExplicitWsdlOptions();
-
- if (effectiveWsdlOptions.size() == 0) {
- getLog().info("Nothing to generate");
- return;
- }
-
- ClassLoaderSwitcher classLoaderSwitcher = new ClassLoaderSwitcher(getLog());
- boolean result = true;
-
Bus bus = null;
+ ClassLoaderSwitcher classLoaderSwitcher = null;
try {
+ configureProxyServerSettings();
+
+ List<GenericWsdlOption> effectiveWsdlOptions = createWsdlOptionsFromScansAndExplicitWsdlOptions();
+
+ if (effectiveWsdlOptions.size() == 0) {
+ getLog().info("Nothing to generate");
+ return;
+ }
+ classLoaderSwitcher = new ClassLoaderSwitcher(getLog());
+ boolean result = true;
+
Set<URI> cp = classLoaderSwitcher.switchClassLoader(project, useCompileClasspath, classesDir);
if ("once".equals(fork) || "true".equals(fork)) {
@@ -272,7 +274,9 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
if (bus != null) {
bus.shutdown(true);
}
- classLoaderSwitcher.restoreClassLoader();
+ if (classLoaderSwitcher != null) {
+ classLoaderSwitcher.restoreClassLoader();
+ }
restoreProxySetting(originalProxyHost, originalProxyPort, originalNonProxyHosts,
originalProxyUser, originalProxyPassword);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/6c77f4aa/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java b/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
index 4e8a531..8110a50 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
@@ -37,6 +37,7 @@ public final class CommandInterfaceUtils {
public static void commandCommonMain() {
if (!testInProgress) {
+ System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", "true");
// force commons-logging into j.u.l so we can
// configure it.
System.setProperty("org.apache.commons.logging.Log",
http://git-wip-us.apache.org/repos/asf/cxf/blob/6c77f4aa/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolRunner.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolRunner.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolRunner.java
index 883bf72..2550ab3 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolRunner.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolRunner.java
@@ -30,7 +30,7 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.common.ToolException;
public final class ToolRunner {
- private static final Logger LOG = LogUtils.getL7dLogger(ToolRunner.class);
+
private ToolRunner() {
// utility class - never constructed
}
@@ -74,6 +74,7 @@ public final class ToolRunner {
boolean exitOnFinish,
ToolContext context,
OutputStream os) throws Exception {
+ System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", "true");
ToolContainer container = null;
@@ -88,8 +89,9 @@ public final class ToolRunner {
new ToolSpec(toolspecStream, validate)
});
} catch (Exception ex) {
- Message message = new Message("CLZ_CANNOT_BE_CONSTRUCTED", LOG, clz.getName());
- LOG.log(Level.SEVERE, message.toString());
+ Logger log = LogUtils.getL7dLogger(ToolRunner.class);
+ Message message = new Message("CLZ_CANNOT_BE_CONSTRUCTED", log, clz.getName());
+ log.log(Level.SEVERE, message.toString());
throw new ToolException(message, ex);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/6c77f4aa/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java
index 3123af0..b429c65 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java
@@ -99,6 +99,8 @@ public class JavaToJS extends AbstractCXFToolContainer {
}
public static void main(String[] pargs) {
+ System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", "true");
+
try {
ToolRunner.runTool(JavaToJS.class,
JavaToJS.class.getResourceAsStream("java2js.xml"),
http://git-wip-us.apache.org/repos/asf/cxf/blob/6c77f4aa/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
index 588bf9c..888e28f 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
@@ -39,6 +39,7 @@ public class JavaToWS {
}
public static void main(String[] args) {
+ System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", "true");
CommandInterfaceUtils.commandCommonMain();
JavaToWS j2w = new JavaToWS(args);
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/6c77f4aa/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java
index 8b88362..9a0e7f4 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java
@@ -91,7 +91,7 @@ public class WADLToJava {
public static void main(String[] pargs) {
-
+ System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", "true");
CommandInterfaceUtils.commandCommonMain();
WADLToJava w2j = new WADLToJava(pargs);
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/6c77f4aa/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
index 7d528bb..984bd53 100644
--- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
+++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
@@ -176,7 +176,8 @@ public class WSDLToJava {
}
public static void main(String[] pargs) {
-
+ System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", "true");
+
CommandInterfaceUtils.commandCommonMain();
WSDLToJava w2j = new WSDLToJava(pargs);
try {
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/58bce070
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/58bce070
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/58bce070
Branch: refs/heads/3.1.x-fixes
Commit: 58bce070e55a52d4e67396dbcd5ef3deaf9636c6
Parents: 6c77f4a
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Mar 27 21:05:47 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Mar 27 21:06:16 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/58bce070/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 050268c..a184639 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -371,6 +371,7 @@ M 386805560479b35276d88605c5acf805e3004aa5
M 39c772a0764b323f98ab58e00345f4fca924c425
M 3a1fa0b23f1778594b6339dfcfbc90dcc43a87d4
M 3b7587395586f59d0fe9427038dd2d891fbe223d
+M 3b967cf6d9c67bebb6e0705a3fdede4d2a6b1015
M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
M 3e30d8892a723adcf04268efd7d407e164607065
@@ -492,12 +493,14 @@ M e92e57c1f14de911cd2315a907443c79e91a94de
M eb31ffe4f95c4dc6ac9a2ac56e15ae89b578359e
M ed9298066428c0dfc4590a556876d696a4ba13c0
M ee248ce7a4a1b04bcbddbdcef82d695ccc140160
+M f133df0f691191fac9566726db06c9b4dc7b65a6
M f462c797eab75e9b6c6c352b4baeb84429866068
M f7f017f2187d59369a7b94bb053f1e297972dce7
M f8439a92170c4cc6a13cf7b9a3c0eec994ebeec5
M f91541bed7e44624556b394cfba9b1a43c9bbdca
M f9a42a528f4edfa7bcc62d5885eebaeb25224cec
M fa973bd7ab43099151f83beea351b80c7140eaab
+M fade9b81dabe27f864ca38e7b40f28fb44d6f165
M faf461150f178f7f7ae89a3b7c345671e53b8b04
M fd6689948bc7ad153ccfd7f64554eafbf64b20d6
M fe89bf0fb8379428667f66312e6942e906142d6f