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 2016/02/02 18:40:17 UTC
[1/7] cxf git commit: update rt/ws/policy's spring.schemas to avoid
remote access
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes cb815b823 -> 8709d976f
update rt/ws/policy's spring.schemas to avoid remote access
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/accfa611
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/accfa611
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/accfa611
Branch: refs/heads/3.1.x-fixes
Commit: accfa6111ed4c129d5c1c4c9a2dbee3a1782a7d0
Parents: cb815b8
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Fri Dec 11 13:25:28 2015 +0100
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 2 12:05:39 2016 -0500
----------------------------------------------------------------------
rt/ws/policy/src/main/resources/META-INF/spring.schemas | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/accfa611/rt/ws/policy/src/main/resources/META-INF/spring.schemas
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/resources/META-INF/spring.schemas b/rt/ws/policy/src/main/resources/META-INF/spring.schemas
index f1d0787..b3f7597 100644
--- a/rt/ws/policy/src/main/resources/META-INF/spring.schemas
+++ b/rt/ws/policy/src/main/resources/META-INF/spring.schemas
@@ -26,4 +26,6 @@ http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.
http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd
http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd
http\://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd=schemas/xmldsig-core-schema.xsd
+http\://www.w3.org/2001/XMLSchema.dtd=schemas/XMLSchema.dtd
+http\://www.w3.org/2001/datatypes.dtd=schemas/datatypes.dtd
[2/7] cxf git commit: Fix logger class
Posted by dk...@apache.org.
Fix logger class
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/85cf215a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/85cf215a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/85cf215a
Branch: refs/heads/3.1.x-fixes
Commit: 85cf215a831057aa249f4638761a7eeafb9f25a2
Parents: accfa61
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Jan 15 10:49:18 2016 +0100
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 2 12:06:12 2016 -0500
----------------------------------------------------------------------
.../main/java/org/apache/cxf/transport/jms/BackChannelConduit.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/85cf215a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/BackChannelConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/BackChannelConduit.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/BackChannelConduit.java
index 9403fd3..7455fc3 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/BackChannelConduit.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/BackChannelConduit.java
@@ -48,7 +48,7 @@ import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
* Conduit for sending the reply back to the client
*/
class BackChannelConduit extends AbstractConduit implements JMSExchangeSender {
- private static final Logger LOG = LogUtils.getL7dLogger(JMSDestination.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(BackChannelConduit.class);
private JMSConfiguration jmsConfig;
private Message inMessage;
private Connection connection;
[4/7] cxf git commit: Fixes for OSGi
Posted by dk...@apache.org.
Fixes for OSGi
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/df39a9e1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/df39a9e1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/df39a9e1
Branch: refs/heads/3.1.x-fixes
Commit: df39a9e14be1f3ff1fdd32e93e4f95c7fab96b00
Parents: b6577a8
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Jan 19 16:33:38 2016 +0100
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 2 12:08:14 2016 -0500
----------------------------------------------------------------------
.../apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java | 7 ++++++-
core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/df39a9e1/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java b/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java
index 390b76c..400dfd9 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java
@@ -44,7 +44,12 @@ public final class NamespaceHandlerRegisterer {
LOG.info("Registered blueprint namespace handler for " + namespace);
}
} catch (Throwable e) {
- LOG.log(Level.WARNING, "Aries Blueprint packages not available. So namespaces will not be registered", e);
+ String msg = "Aries Blueprint packages not available. So namespaces will not be registered";
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.WARNING, msg, e);
+ } else {
+ LOG.log(Level.WARNING, msg);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/df39a9e1/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
index 030c8a0..c66d136 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
@@ -47,7 +47,7 @@ import org.osgi.util.tracker.ServiceTracker;
public class CXFActivator implements BundleActivator {
private List<Extension> extensions;
- private ManagedWorkQueueList workQueues = new ManagedWorkQueueList();
+ private ManagedWorkQueueList workQueues;
private ServiceTracker configAdminTracker;
private CXFExtensionBundleListener cxfBundleListener;
private ServiceRegistration workQueueServiceRegistration;
@@ -56,6 +56,7 @@ public class CXFActivator implements BundleActivator {
/** {@inheritDoc}*/
public void start(BundleContext context) throws Exception {
+ workQueues = new ManagedWorkQueueList();
cxfBundleListener = new CXFExtensionBundleListener(context.getBundle().getBundleId());
context.addBundleListener(cxfBundleListener);
cxfBundleListener.registerExistingBundles(context);
[5/7] cxf git commit: Add some test cases for CXF-6764 and log a
message if the mapper fails
Posted by dk...@apache.org.
Add some test cases for CXF-6764 and log a message if the mapper fails
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/24311ae6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/24311ae6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/24311ae6
Branch: refs/heads/3.1.x-fixes
Commit: 24311ae6d88b2359f61b4def6a6308a90378c596
Parents: df39a9e
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jan 28 15:17:11 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 2 12:08:47 2016 -0500
----------------------------------------------------------------------
.../org/apache/cxf/common/jaxb/JAXBUtils.java | 31 ++++---
.../apache/cxf/jaxb/JAXBDataBindingTest.java | 91 +++++++++++++++++---
2 files changed, 97 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/24311ae6/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index 6440c37..f8a21d0 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -74,6 +74,7 @@ import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ASMHelper;
import org.apache.cxf.common.util.ASMHelper.ClassWriter;
import org.apache.cxf.common.util.ASMHelper.FieldVisitor;
@@ -91,6 +92,7 @@ import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.cxf.helpers.JavaUtils;
public final class JAXBUtils {
+ public static final Logger LOG = LogUtils.getL7dLogger(JAXBUtils.class);
public enum IdentifierType {
CLASS,
@@ -623,15 +625,17 @@ public final class JAXBUtils {
public static Object setNamespaceMapper(final Map<String, String> nspref,
Marshaller marshaller) throws PropertyException {
Object mapper = createNamespaceWrapper(marshaller.getClass(), nspref);
- if (marshaller.getClass().getName().contains(".internal.")) {
- marshaller.setProperty("com.sun.xml.internal.bind.namespacePrefixMapper",
- mapper);
- } else if (marshaller.getClass().getName().contains("com.sun")) {
- marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper",
- mapper);
- } else if (marshaller.getClass().getName().contains("eclipse")) {
- marshaller.setProperty("eclipselink.namespace-prefix-mapper",
- mapper);
+ if (mapper != null) {
+ if (marshaller.getClass().getName().contains(".internal.")) {
+ marshaller.setProperty("com.sun.xml.internal.bind.namespacePrefixMapper",
+ mapper);
+ } else if (marshaller.getClass().getName().contains("com.sun")) {
+ marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper",
+ mapper);
+ } else if (marshaller.getClass().getName().contains("eclipse")) {
+ marshaller.setProperty("eclipselink.namespace-prefix-mapper",
+ mapper);
+ }
}
return mapper;
}
@@ -1084,6 +1088,7 @@ public final class JAXBUtils {
String className = "org.apache.cxf.jaxb.NamespaceMapper";
className += postFix;
Class<?> cls = helper.findClass(className, JAXBUtils.class);
+ Throwable t = null;
if (cls == null) {
try {
ClassWriter cw = helper.createClassWriter();
@@ -1092,15 +1097,17 @@ public final class JAXBUtils {
}
} catch (RuntimeException ex) {
// continue
+ t = ex;
}
}
if (cls == null
- && (mcls.getName().contains(".internal.") || mcls.getName().contains("com.sun"))) {
+ && (!mcls.getName().contains(".internal.") && mcls.getName().contains("com.sun"))) {
try {
cls = ClassLoaderUtils.loadClass("org.apache.cxf.common.jaxb.NamespaceMapper",
JAXBUtils.class);
- } catch (ClassNotFoundException ex2) {
+ } catch (Throwable ex2) {
// ignore
+ t = ex2;
}
}
if (cls != null) {
@@ -1108,8 +1115,10 @@ public final class JAXBUtils {
return cls.getConstructor(Map.class).newInstance(map);
} catch (Exception e) {
// ignore
+ t = e;
}
}
+ LOG.log(Level.INFO, "Could not create a NamespaceMapper compatible with Marshaller class " + mcls.getName(), t);
return null;
}
/*
http://git-wip-us.apache.org/repos/asf/cxf/blob/24311ae6/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
index 4621481..980f2de 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
@@ -38,6 +38,7 @@ import javax.wsdl.Definition;
import javax.wsdl.Service;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
+import javax.xml.bind.JAXBContext;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -54,6 +55,8 @@ import org.w3c.dom.Node;
import org.apache.cxf.Bus;
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.ASMHelper;
+import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.databinding.DataReader;
import org.apache.cxf.databinding.DataWriter;
import org.apache.cxf.helpers.CastUtils;
@@ -205,32 +208,92 @@ public class JAXBDataBindingTest extends Assert {
assertTrue(xml, xml.contains("uri:ultima:thule"));
}
- @Test
- public void testDeclaredNamespaceMapping() throws Exception {
+ JAXBDataBinding createJaxbContext(boolean internal) throws Exception {
JAXBDataBinding db = new JAXBDataBinding();
Map<String, String> nsMap = new HashMap<String, String>();
nsMap.put("uri:ultima:thule", "greenland");
db.setNamespaceMap(nsMap);
Map<String, Object> contextProperties = new HashMap<String, Object>();
- //contextProperties.put("com.sun.xml.bind.defaultNamespaceRemap", "uri:ultima:thule");
db.setContextProperties(contextProperties);
Set<Class<?>> classes = new HashSet<Class<?>>();
classes.add(QualifiedBean.class);
- db.setContext(db.createJAXBContext(classes));
- DataWriter<XMLStreamWriter> writer = db.createWriter(XMLStreamWriter.class);
- XMLOutputFactory writerFactory = XMLOutputFactory.newInstance();
- StringWriter stringWriter = new StringWriter();
- XMLStreamWriter xmlWriter = writerFactory.createXMLStreamWriter(stringWriter);
- QualifiedBean bean = new QualifiedBean();
- bean.setAriadne("spider");
- writer.write(bean, xmlWriter);
- xmlWriter.flush();
- String xml = stringWriter.toString();
- assertTrue(xml, xml.contains("greenland=\"uri:ultima:thule"));
+
+ //have to fastboot to avoid conflicts of generated accessors
+ System.setProperty("com.sun.xml.bind.v2.runtime.JAXBContextImpl.fastBoot", "true");
+ System.setProperty("com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl.fastBoot", "true");
+ if (internal) {
+ System.setProperty(JAXBContext.JAXB_CONTEXT_FACTORY, "com.sun.xml.internal.bind.v2.ContextFactory");
+ db.setContext(db.createJAXBContext(classes));
+ System.clearProperty(JAXBContext.JAXB_CONTEXT_FACTORY);
+ } else {
+ db.setContext(db.createJAXBContext(classes));
+ }
+ System.clearProperty("com.sun.xml.bind.v2.runtime.JAXBContextImpl.fastBoot");
+ System.clearProperty("com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl.fastBoot");
+ return db;
}
+ void doNamespaceMappingTest(boolean internal, boolean asm) throws Exception {
+ if (internal) {
+ try {
+ Class.forName("com.sun.xml.internal.bind.v2.ContextFactory");
+ } catch (Throwable t) {
+ //on a JVM (likely IBM's) that doesn't rename the ContextFactory package to include "internal"
+ return;
+ }
+ }
+ try {
+ if (!asm) {
+ ReflectionUtil.setAccessible(ReflectionUtil.getDeclaredField(ASMHelper.class, "badASM"))
+ .set(null, Boolean.TRUE);
+ }
+
+ JAXBDataBinding db = createJaxbContext(internal);
+
+ DataWriter<XMLStreamWriter> writer = db.createWriter(XMLStreamWriter.class);
+ XMLOutputFactory writerFactory = XMLOutputFactory.newInstance();
+ StringWriter stringWriter = new StringWriter();
+ XMLStreamWriter xmlWriter = writerFactory.createXMLStreamWriter(stringWriter);
+ QualifiedBean bean = new QualifiedBean();
+ bean.setAriadne("spider");
+ writer.write(bean, xmlWriter);
+ xmlWriter.flush();
+ String xml = stringWriter.toString();
+ assertTrue("Failed to map namespace " + xml, xml.contains("greenland=\"uri:ultima:thule"));
+ } finally {
+ if (!asm) {
+ ReflectionUtil.setAccessible(ReflectionUtil.getDeclaredField(ASMHelper.class, "badASM"))
+ .set(null, Boolean.FALSE);
+ }
+ }
+ }
+
+ @Test
+ public void testDeclaredNamespaceMappingRI() throws Exception {
+ doNamespaceMappingTest(false, true);
+ }
@Test
+ public void testDeclaredNamespaceMappingInternal() throws Exception {
+ doNamespaceMappingTest(true, true);
+ }
+ @Test
+ public void testDeclaredNamespaceMappingRINoAsm() throws Exception {
+ doNamespaceMappingTest(false, false);
+ }
+
+ @Test
+ public void testDeclaredNamespaceMappingInternalNoAsm() throws Exception {
+ try {
+ doNamespaceMappingTest(true, false);
+ fail("Internal needs ASM");
+ } catch (AssertionError er) {
+ er.getMessage().contains("Failed to map namespace");
+ }
+ }
+
+
+ @Test
public void testResursiveType() throws Exception {
Set<Class<?>> classes = new HashSet<Class<?>>();
Collection<Object> typeReferences = new ArrayList<Object>();
[6/7] 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/f7c9fe2f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f7c9fe2f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f7c9fe2f
Branch: refs/heads/3.1.x-fixes
Commit: f7c9fe2f9e3f3ca12b426903be3a1e36e74f9c20
Parents: 24311ae
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Feb 2 12:09:00 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 2 12:09:00 2016 -0500
----------------------------------------------------------------------
.gitmergeinfo | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f7c9fe2f/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3691749..7aaed2e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,29 +1,54 @@
origin/master
B 0234c09c11c0f89bd17f9b82695daa12af1fad09
+B 0336a2399b1980e04372c651368f8718f75a4f14
B 0d4cd0bbcaa6a4f80552d6b38f2a5e721ab20de9
B 0dfaf8d72574511ad9027c663707f9e30b945fbc
+B 111d52fd4b92d0222af9bf1c22156145ea01ed01
+B 248c8f0458ce938a65c35006d484c6a4610cde1b
+B 304c62a11b8dbe000cdfb5de857619703bca79f7
+B 343d06d94838cd26f682f7afbcea0e422aa1597d
B 39851b83af116611ce0efe70c4b9a32ee8491523
+B 3b2f2ed2db01f05fa9b648693ce33978ccc8ede8
+B 47a431412dbd7669d89a70d6fed49053e70dfed1
+B 53a46205871434d8c47ed45822e078e5ad6d2c60
B 59b8615053ddcad353fbebcd9a5b1109ae0897a1
B 65e1e07fdb810ec9de135530ca3e3d23821836a3
+B 68f110e5bcfe26d050bd05988ecd9c863e6e8742
B 6e7b79f6a8b6523b2248937275d92918e5682aa2
+B 77c3f51dcb1f02c8799f4e09676c0697e76a0756
B 7b7629682d15345518e66d46e575bf1ac334cf00
B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26
B 85c397f853c6b7ca0ed6d924445d6173962e1ec4
B 8a4e85b24d6d5b438ceb28257c53773d46b5816d
B 8b92fe57dd9a661dab382da7d556b1972f513a93
+B 8f98be8e72d4dbe18347a7efab91f4b008d8385f
+B a219766354d6aee53c7f7a4da91f434af552b437
B a261507ebd3104b1a00298801ec9815ed1e7a728
B a7362dfaf2141cb4f303f81bbb94c6df81be75cb
B bceee342b32f3704ca75176d06067f90c6d3fbdc
+B befeb0484cb195cbcd6163f65c54a94ba26d8335
+B c1eaf69cb16583f672ddef646dcd7a52cfa23b5d
B ced98c6e937bd93f92dac9043fa0406c696bfd84
+B cf9ab27a843df4532d9bd78209aebcafee2ffffc
+B efb1f0830f5441777198737fb26e9305ab969f66
B f0e08b7bea2660542e18294d490e68c7b14aaa4b
B f1b56150d6520e73d2ade2296c3b2f13839e63e5
B f94e1dd9b2a8d27ec5a27bfb7c026e3ae2350e39
+B f98785bd8490c4717353f1a9688cae3e7a823ec2
B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
M 0222768baf6b60742c4a8332308edf2be0f4a2e4
+M 0578e16146527b0782530c40ba2db17531756d96
M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6
+M 386805560479b35276d88605c5acf805e3004aa5
+M 39c772a0764b323f98ab58e00345f4fca924c425
+M 63a1088a9253da0452497440e900d35a5415c3c9
+M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
M 8583a24ac541dc373503d7a6c59cd90890acdae3
+M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435
+M 8e131133c8566a124605cb06e0b6db98fddb5972
M 8e650cfe3efd63a06c25b7e912d9d4db61598eb1
M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
+M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
M a1710bdd783afcd667d9e72ccb031480d3806850
M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
M fe89bf0fb8379428667f66312e6942e906142d6f
[7/7] cxf git commit: Update release notes for 3.1.5
Posted by dk...@apache.org.
Update release notes for 3.1.5
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8709d976
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8709d976
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8709d976
Branch: refs/heads/3.1.x-fixes
Commit: 8709d976fc796abe7ed6785524e5453b5fc530fb
Parents: f7c9fe2
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Feb 2 12:39:19 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 2 12:39:19 2016 -0500
----------------------------------------------------------------------
distribution/src/main/release/release_notes.txt | 105 +++++++++++--------
1 file changed, 61 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8709d976/distribution/src/main/release/release_notes.txt
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt
index 74dd8d2..8252a86 100644
--- a/distribution/src/main/release/release_notes.txt
+++ b/distribution/src/main/release/release_notes.txt
@@ -1,8 +1,8 @@
-Apache CXF 3.1.4 Release Notes
+Apache CXF 3.1.5 Release Notes
1. Overview
-The 3.1.4 version of Apache CXF is a significant new version of CXF
+The 3.1.5 version of Apache CXF is a significant new version of CXF
that provides several new features and enhancements.
New features include:
@@ -25,7 +25,7 @@ http://cxf.apache.org/docs/31-migration-guide.html
for further information and requirements for upgrading from earlier
versions of CXF.
-3.1.4 fixes over 35 JIRA issues reported by users and the community.
+3.1.4 fixes over 50 JIRA issues reported by users and the community.
@@ -71,47 +71,64 @@ to 3.1.
7. Specific issues, features, and improvements fixed in this version
+
** Bug
- * [CXF-6347] - CXF bundle activators not called in Eclipse/Equinox
- * [CXF-6493] - cxf-rt-transports-http-3.1.1.jar contains OSGi interface classes
- * [CXF-6595] - CXF Karaf feature file: set dependency = true in the jta bundle for CXF
- * [CXF-6599] - CXF ProxyHelper might cause OOM like conditions
- * [CXF-6600] - Sudden repeating NPE on token request by STSClient
- * [CXF-6601] - Swagger2Feature can hit a NPE when running in localtransport
- * [CXF-6602] - Digest algorithms are not set properly when derived keys are used
- * [CXF-6607] - Cached STS-issued tokens are not renewed on expiry in delegation scenario
- * [CXF-6613] - java.lang.NoSuchFieldError: REFLECTION in CFX 3.1.4-SNAPSHOT
- * [CXF-6614] - "Comparison method violates its general contract" in DestinationRegistryImpl.getSortedDestinations
- * [CXF-6615] - the order of attributes in SubjectDN of certificate shouldn't be significant
- * [CXF-6616] - need always close the CipherOutputStream when the encryption is done to get the complete content
- * [CXF-6620] - Fix DefaultSubjectProvider to support NameID formats other than “unspecified”
- * [CXF-6621] - Schema imports are not handled correctly in generated WSDL and XSD files when using catalog rewrites
- * [CXF-6629] - ConcurrentModificationException at AbstractResourceInfo.clearProxies()
- * [CXF-6630] - Cannot call setAttribute with a null name
- * [CXF-6632] - Memory leak due to literal keys in WSDLDefinition map
- * [CXF-6637] - @GZIP and similar CXF annotations are not recognized if set on super classes
- * [CXF-6638] - AsyncHTTPConduit does not allow body payloads with "PATCH" method
- * [CXF-6642] - Memory Leak in ResponseImpl.readEntity()
- * [CXF-6648] - Wildcard Content-Type is set for GET
- * [CXF-6653] - NPE may result while generating a SequenceFault in WS-RM 1.1
- * [CXF-6655] - Error Invalid address. Endpoint address cannot be null
- * [CXF-6657] - CXF Failover using JAXRS prevents header retrieval from ResponseExceptionMappers
+ * [CXF-6172] - WS-Discovery should work also in IPv6 only environment
+ * [CXF-6574] - Issue with Digest Authentication
+ * [CXF-6660] - SamlTokenInterceptor Jasypt decryption
+ * [CXF-6664] - NullpointerException in LinkBuilderImpl#getResolvedUri when linkheader url has a matrix parameter
+ * [CXF-6667] - Closing a source sequence in WS-RM may lead to inconsistent sequence status
+ * [CXF-6668] - [wadl2java] @Multipart annotation generated, @QueryParam expected
+ * [CXF-6670] - Problem with casting ParamConverter responses to primitive types
+ * [CXF-6671] - Ambiguous JAXRSServerFactoryBean.setApplication() breaks Spring injection
+ * [CXF-6673] - StaticService setEndpoints(List<String>) doesn't work correctly
+ * [CXF-6675] - Update commons-collections from 3.2.1 to 3.2.2
+ * [CXF-6676] - Incorrect Interface Method Name Generation
+ * [CXF-6677] - Content-Type is empty on POST request with empty body
+ * [CXF-6679] - @Context HttpServletRequest request.getParameterMap() can't contain post parameters by application/x-www-form-urlencoded
+ * [CXF-6688] - ClientProxyImpl does not populate class-level path params if BeanParam holds the values
+ * [CXF-6693] - CXF fails to parse Cookie header when it contains $ character
+ * [CXF-6694] - SpringResourceFactory does not work with constructor-autowired beans
+ * [CXF-6699] - DefaultAddress not set in HTTPConduit class
+ * [CXF-6701] - JAXRS Proxy impl does not check field JAXRS annotations on BeanParam super classes
+ * [CXF-6705] - Incorrect version in Import-Package for javax.validation for CXF Core
+ * [CXF-6706] - Bean validation seems to not be working in OSGi
+ * [CXF-6709] - HttpServletRequest.getInputStream is empty
+ * [CXF-6711] - Aegis Databinding Deserialization Vulnerability
+ * [CXF-6715] - SAMLProtocolResponseValidator fails to decrypt an assertion
+ * [CXF-6719] - GZIPOutInterceptor enum scope change breaks method contract
+ * [CXF-6720] - AbstractHTTPDestination#WrappedOutputStream.close() calls flush after close
+ * [CXF-6721] - NullPointerException for some responses containing SoapFault.
+ * [CXF-6729] - Version 1 NewCookie is not compliant with RFC 2109
+ * [CXF-6730] - ClassCastException TransportBinding cannot be cast to AbstractSymmetricAsymmetricBinding in AbstractBindingBuilder
+ * [CXF-6744] - Exceptions thrown from methods annotated with @Suspended result in no response at all
+ * [CXF-6748] - the qop,nc,algorithm parameter in http auth header must not be enclosed between doble quotation
+ * [CXF-6749] - Classloader leak on FileUtils.createTmpDir()
+ * [CXF-6753] - OAuth2 audience support is incomplete
+ * [CXF-6754] - Determin Media Type in Response
+ * [CXF-6759] - WADL2JAVA Tools Generated Source has Duplicate Method Name
+ * [CXF-6761] - JAX-RS ClientImpl does not set TLSClientParameters on HTTPConduit when only HostnameVerifier is configured
+ * [CXF-6762] - DefaultHostnameVerifier fails for non-root wildcard SAN DNSName entries
+ * [CXF-6763] - STS requires ClaimHandler even in ClaimMapping only scenarios
** Improvement
- * [CXF-5606] - WADL to Java code generator should translate wadl:doc into Java documentation
- * [CXF-6623] - Add support for nested @BeanParam's
- * [CXF-6625] - Wadl-to-Java should be able to generate custom method annotation classes
- * [CXF-6633] - Enhance Swagger feature with optional dynamic basePath, tags and Javadocs handling
- * [CXF-6634] - Move DocumentationProvider interface out of .model.wadl. package
- * [CXF-6643] - Upgrade Apache HTrace to 4.0
- * [CXF-6644] - Move Basic JSON parser code into a dedicated module
- * [CXF-6645] - Introduce a 'jose.debug' property
- * [CXF-6649] - Add Karaf feature cxf-rs-description-swagger2
- * [CXF-6658] - Make ServletContextResourceResolver optionally ignored
-
-
-** Task
- * [CXF-6503] - Investigate if WADL JavaDocProvider can report JavaDocs of inherited methods
-
-
-
+ * [CXF-6610] - Throttling Interceptors can not abort but only delay overflowing requests
+ * [CXF-6661] - WADLGenerator should optionally include xsi schemaLocation
+ * [CXF-6663] - Scope based authorization support for OAuth2 RS endpoints
+ * [CXF-6686] - Provide AccessTokenValidator RFC7662
+ * [CXF-6690] - WADL2Java should try to split complex XJC parameters
+ * [CXF-6695] - SwaggerFeature: add support for @MatrixParam and @BeanParam
+ * [CXF-6712] - [cxf-java2wadl-plugin] Add parameter encoding to goal parsejavadoc
+ * [CXF-6716] - java2ws should log a warning message for a Holder parameter annoated with WebParam.Mode.IN property
+ * [CXF-6722] - OAuthDataProvider needs to have methods for listing client tokens
+ * [CXF-6732] - Allow SOAPAction to be overwritten via RequestContext property
+ * [CXF-6736] - Support login_hint at OidcClientCodeRequestFilter
+ * [CXF-6738] - Reduce contention on org.apache.cxf.binding.soap.SoapTransportFactory$SoapEndpointInfo
+ * [CXF-6739] - Reduce memory pressure in org.apache.cxf.attachment.AttachmentDeserializer
+
+
+** New Feature
+ * [CXF-6735] - Enable/Disable SecurityTokenReference with configuration for CXF/.NET interoperability
+
+** Wish
+ * [CXF-6704] - Upgrade to httpclient 4.5.x
[3/7] cxf git commit: Remove an un-used variable
Posted by dk...@apache.org.
Remove an un-used variable
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b6577a8f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b6577a8f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b6577a8f
Branch: refs/heads/3.1.x-fixes
Commit: b6577a8fa68235fb8bb0103681906289bcf5e069
Parents: 85cf215
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jan 18 15:50:55 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 2 12:07:47 2016 -0500
----------------------------------------------------------------------
.../org/apache/cxf/transport/http/AbstractHTTPDestination.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b6577a8f/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
index d79e75b..11c48d2 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
@@ -726,7 +726,7 @@ public abstract class AbstractHTTPDestination
OutputStream os = message.getContent(OutputStream.class);
if (os == null) {
message.setContent(OutputStream.class,
- new WrappedOutputStream(message, response));
+ new WrappedOutputStream(message));
}
}
@@ -758,13 +758,11 @@ public abstract class AbstractHTTPDestination
*/
private class WrappedOutputStream extends AbstractWrappedOutputStream implements CopyingOutputStream {
- protected HttpServletResponse response;
private Message outMessage;
- WrappedOutputStream(Message m, HttpServletResponse resp) {
+ WrappedOutputStream(Message m) {
super();
this.outMessage = m;
- response = resp;
}