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/23 13:28:43 UTC
[1/5] cxf git commit: CXF-6942 - Fix to resolve problem finding wsdl
with classifier When using true when generating a
wsdl an ealier fix added the classifier to the artifact. This classifier is
not used correctly by cxf-codegen-p
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 6b7631060 -> 70837021f
CXF-6942 - Fix to resolve problem finding wsdl with classifier
When using <attachWsdl>true<attachWsdl> when generating a wsdl
an ealier fix added the classifier to the artifact. This
classifier is not used correctly by cxf-codegen-plugin when
<wsdlArtifact> is used to locate the wsdl-file. This fix adds
an extra check to see if an artifact with exists with type
containing the classifier.
This closes #144
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1d8b0674
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1d8b0674
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1d8b0674
Branch: refs/heads/3.1.x-fixes
Commit: 1d8b06748b972b5c7b917f31d0cf66bc4f81f139
Parents: 6b76310
Author: Eivind Bergst�l <ei...@bergstol.no>
Authored: Tue Jun 28 10:55:51 2016 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Mar 23 08:40:27 2017 -0400
----------------------------------------------------------------------
.../apache/cxf/maven_plugin/AbstractCodegenMoho.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1d8b0674/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 fe589da..c6b28ec 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
@@ -871,11 +871,14 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
if (artifactSet != null && !artifactSet.isEmpty()) {
for (Artifact pArtifact : artifactSet) {
if (targetArtifact.getGroupId().equals(pArtifact.getGroupId())
- && targetArtifact.getArtifactId().equals(pArtifact.getArtifactId())
- && targetArtifact.getVersion().equals(pArtifact.getVersion())
- && "wsdl".equals(pArtifact.getType())) {
- getLog().info(String.format("%s resolved to %s", pArtifact.toString(), pArtifact
- .getFile().getAbsolutePath()));
+ && targetArtifact.getArtifactId().equals(pArtifact.getArtifactId())
+ && targetArtifact.getVersion().equals(pArtifact.getVersion())
+ && ("wsdl".equals(pArtifact.getType())
+ || (
+ targetArtifact.getClassifier() != null
+ && pArtifact.getType() != null
+ && (targetArtifact.getClassifier() + ".wsdl").equals(pArtifact.getType())
+ ))) {
return pArtifact;
}
}
[2/5] cxf git commit: [CXF-3574] Support additional JMS property types
Posted by dk...@apache.org.
[CXF-3574] Support additional JMS property types
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/79f01729
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/79f01729
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/79f01729
Branch: refs/heads/3.1.x-fixes
Commit: 79f01729f363f30916861219b9bfb51469da5121
Parents: 1d8b067
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 22 18:39:58 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Mar 23 08:40:32 2017 -0400
----------------------------------------------------------------------
.../cxf/transport/jms/JMSMessageUtils.java | 26 +++++++++++++++++++-
.../cxf/transport/jms/JMSPropertyType.java | 19 +++++++-------
2 files changed, 34 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/79f01729/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
index 3975b63..151f9a8 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
@@ -384,7 +384,31 @@ final class JMSMessageUtils {
if (messageProperties.isSetProperty()) {
for (JMSPropertyType prop : messageProperties.getProperty()) {
- jmsMessage.setStringProperty(prop.getName(), prop.getValue());
+ Object o = prop.getValue();
+ if (o != null) {
+ Class<?> cls = o.getClass();
+ if (cls == String.class) {
+ jmsMessage.setStringProperty(prop.getName(), (String)o);
+ } else if (cls == Integer.TYPE || cls == Integer.class) {
+ jmsMessage.setIntProperty(prop.getName(), (Integer)o);
+ } else if (cls == Double.TYPE || cls == Double.class) {
+ jmsMessage.setDoubleProperty(prop.getName(), (Double)o);
+ } else if (cls == Float.TYPE || cls == Float.class) {
+ jmsMessage.setFloatProperty(prop.getName(), (Float)o);
+ } else if (cls == Long.TYPE || cls == Long.class) {
+ jmsMessage.setLongProperty(prop.getName(), (Long)o);
+ } else if (cls == Boolean.TYPE || cls == Boolean.class) {
+ jmsMessage.setBooleanProperty(prop.getName(), (Boolean)o);
+ } else if (cls == Short.TYPE || cls == Short.class) {
+ jmsMessage.setShortProperty(prop.getName(), (Short)o);
+ } else if (cls == Byte.TYPE || cls == Byte.class) {
+ jmsMessage.setShortProperty(prop.getName(), (Byte)o);
+ } else {
+ jmsMessage.setObjectProperty(prop.getName(), o);
+ }
+ } else {
+ jmsMessage.setStringProperty(prop.getName(), null);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/79f01729/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
index 0574800..3d9a8f5 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSPropertyType.java
@@ -18,34 +18,33 @@
*/
package org.apache.cxf.transport.jms;
-//CHECKSTYLE:OFF
public class JMSPropertyType {
protected String name;
- protected String value;
+ protected Object value;
public String getName() {
return name;
}
- public void setName(String value) {
- this.name = value;
+ public void setName(String name) {
+ this.name = name;
}
public boolean isSetName() {
- return (this.name != null);
+ return this.name != null;
}
- public String getValue() {
+ public Object getValue() {
return value;
}
- public void setValue(String value) {
+ public void setValue(Object value) {
this.value = value;
}
public boolean isSetValue() {
- return (this.value != null);
+ return this.value != null;
}
-
+
}
-//CHECKSTYLE:ON
+
[3/5] cxf git commit: [CXF-5903] Log exception in
TrnasportURIRresolver
Posted by dk...@apache.org.
[CXF-5903] Log exception in TrnasportURIRresolver
# Conflicts:
# core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/67087e8f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/67087e8f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/67087e8f
Branch: refs/heads/3.1.x-fixes
Commit: 67087e8fff69d38de2d089ac2ff6e32ec2385d5a
Parents: 79f0172
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 22 18:47:30 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Mar 23 08:41:13 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/cxf/transport/TransportURIResolver.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/67087e8f/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
index 5809121..3cee71e 100644
--- a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
+++ b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
@@ -25,12 +25,15 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashSet;
import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.xml.namespace.QName;
import org.xml.sax.InputSource;
import org.apache.cxf.Bus;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.helpers.LoadingByteArrayOutputStream;
import org.apache.cxf.message.Exchange;
@@ -44,6 +47,8 @@ import org.apache.cxf.service.model.EndpointInfo;
*
*/
public class TransportURIResolver extends ExtendedURIResolver {
+ static final Logger LOG = LogUtils.getL7dLogger(TransportURIResolver.class);
+
private static final Set<String> DEFAULT_URI_RESOLVER_HANDLES = new HashSet<String>();
static {
//bunch we really don't want to have the conduits checked for
@@ -63,7 +68,6 @@ public class TransportURIResolver extends ExtendedURIResolver {
}
public InputSource resolve(String curUri, String baseUri) {
-
// Spaces must be encoded or URI.resolve() will choke
curUri = curUri.replace(" ", "%20");
@@ -79,6 +83,7 @@ public class TransportURIResolver extends ExtendedURIResolver {
} catch (URISyntaxException use) {
//ignore
base = null;
+ LOG.log(Level.FINEST, "Could not resolve curUri " + curUri, use);
}
try {
if (base == null
@@ -87,6 +92,7 @@ public class TransportURIResolver extends ExtendedURIResolver {
}
} catch (Exception ex) {
//nothing
+ LOG.log(Level.FINEST, "Default URI handlers could not resolve " + baseUri + " " + curUri, ex);
}
if (is == null && base != null
&& base.getScheme() != null
@@ -141,6 +147,7 @@ public class TransportURIResolver extends ExtendedURIResolver {
}
} catch (Exception e) {
//ignore
+ LOG.log(Level.FINEST, "Conduit initiator could not resolve " + baseUri + " " + curUri, e);
}
}
if (is == null
[4/5] cxf git commit: [CXF-6240] add reporting of processing
instructions to W3CDOMStreamReader
Posted by dk...@apache.org.
[CXF-6240] add reporting of processing instructions to W3CDOMStreamReader
# Conflicts:
# core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/896f9890
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/896f9890
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/896f9890
Branch: refs/heads/3.1.x-fixes
Commit: 896f9890d996972b82afa819f0417876f5198c44
Parents: 67087e8
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 22 19:01:59 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Mar 23 08:41:47 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/cxf/staxutils/W3CDOMStreamReader.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/896f9890/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
index eb8442b..0836379 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
@@ -33,6 +33,7 @@ import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
import org.w3c.dom.TypeInfo;
@@ -188,6 +189,8 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
return CDATA;
case Node.ENTITY_REFERENCE_NODE:
return ENTITY_REFERENCE;
+ case Node.PROCESSING_INSTRUCTION_NODE:
+ return PROCESSING_INSTRUCTION;
default:
throw new IllegalStateException("Found type: " + content.getClass().getName());
}
@@ -398,12 +401,13 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
}
public String getPITarget() {
- throw new UnsupportedOperationException();
+ return ((ProcessingInstruction)content).getTarget();
}
public String getPIData() {
- throw new UnsupportedOperationException();
- }
+ return ((ProcessingInstruction)content).getData();
+ }
+
public Location getLocation() {
try {
Object o = getCurrentNode().getUserData("location");
[5/5] 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/70837021
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/70837021
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/70837021
Branch: refs/heads/3.1.x-fixes
Commit: 70837021f60524b60e4328c5f422227c6170ff30
Parents: 896f989
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Mar 23 08:41:47 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Mar 23 08:41:47 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/70837021/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 978df9d..a99d969 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -28,6 +28,7 @@ B 111d52fd4b92d0222af9bf1c22156145ea01ed01
B 1224d5cc9f646aa3a4924ce9cb045366d2f4cdff
B 122d1f64f248294a4303632571ec363aea4c2179
B 1304bc2ffbe6b4c3bfdc4e4f47e5e224e52fd808
+B 137485de37b3bf81e305e616a5af81741620f547
B 140ad80be96ea11d360cd7a1d8e791ca91a2220d
B 1552f881183ba35b3706dc3c8061d7c6d85c7238
B 16931d7ae0cbb38e987923bf604cd403c1caee7f
@@ -44,6 +45,7 @@ B 1d2ff721ef4d63b86035238516afdf1a82855bd9
B 1e49510ea71551e543b22f6693307b1436e81db0
B 1f68d848874bc2be86d3e77e408f0b9879c1e93c
B 203b5433bc44aa831bdd9b1dd4ab474d192dea6c
+B 20951aeac115e7ae95f4d4cc04da288d2f47e4b2
B 2103bc5951b0905b134a7bafddd6cc07822132ff
B 219628c58badaf308817a410d61ec704b2246899
B 22755d26ec2f6255004f57deec711ee68ce11d6c
@@ -124,6 +126,7 @@ B 604167d9f0cfc67e01219a19a95353176ce38f79
B 62060f8bc1f4d85b77ff136cb0576049312b8541
B 629af817f4762a12623e76fb7f7baefe98482719
B 63daada33c83c7900d5678ad495a0e764b3506de
+B 64070aa91b4b56155faf7703520a5142fa7a6e36
B 64e17b90635e7acd6f0836ab2bb8f6ede026ecff
B 65e1e07fdb810ec9de135530ca3e3d23821836a3
B 66447a377f0b2cafc2f337456b5fd41f832556e0
@@ -171,6 +174,7 @@ B 8cea7c879658e83d7a4f54f6d4e8dfa0e449c67d
B 8e769d46b1a1bcc27da0740f23020a2776aff6e5
B 8e7d8e18e820dcaef748c2cab6091f884fe647a4
B 8f98be8e72d4dbe18347a7efab91f4b008d8385f
+B 9063184ba1280e6d2492ec47d6ebfbb7a19c25ab
B 90a74fc75af41898ee50359c13f298eb483a3d01
B 91ef0687ed14842dc9efd5a09a59164b5328649a
B 9323b68565ef79717e9d3e60744dd1bf63c1a5d8
@@ -359,6 +363,7 @@ M 3833280c67c489a7e83b8540361df4154f4aeccf
M 386805560479b35276d88605c5acf805e3004aa5
M 39c772a0764b323f98ab58e00345f4fca924c425
M 3a1fa0b23f1778594b6339dfcfbc90dcc43a87d4
+M 3b7587395586f59d0fe9427038dd2d891fbe223d
M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
M 3e30d8892a723adcf04268efd7d407e164607065
@@ -468,6 +473,7 @@ M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa
M e92e57c1f14de911cd2315a907443c79e91a94de
M eb31ffe4f95c4dc6ac9a2ac56e15ae89b578359e
M ed9298066428c0dfc4590a556876d696a4ba13c0
+M ee248ce7a4a1b04bcbddbdcef82d695ccc140160
M f462c797eab75e9b6c6c352b4baeb84429866068
M f7f017f2187d59369a7b94bb053f1e297972dce7
M f8439a92170c4cc6a13cf7b9a3c0eec994ebeec5