You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2016/07/04 15:08:47 UTC
[1/2] cxf git commit: Make logging of missing blueprint less verbose
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 55cb81445 -> b733306d0
Make logging of missing blueprint less verbose
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b84bd51d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b84bd51d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b84bd51d
Branch: refs/heads/3.1.x-fixes
Commit: b84bd51dad062c605e8acdcdcfce610aaed7c3b3
Parents: 55cb814
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Jun 30 14:14:57 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Jul 4 17:08:26 2016 +0200
----------------------------------------------------------------------
.../apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b84bd51d/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 463236f..14d4ced 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,11 +44,10 @@ public final class NamespaceHandlerRegisterer {
LOG.fine("Registered blueprint namespace handler for " + namespace);
}
} catch (Throwable 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);
+ if (e instanceof NoClassDefFoundError) {
+ LOG.log(Level.INFO, "Aries Blueprint packages not available. So namespaces will not be registered");
} else {
- LOG.log(Level.WARNING, msg);
+ LOG.log(Level.WARNING, "Unexpected exception when trying to install Aries Blueprint namespaces", e);
}
}
}
[2/2] cxf git commit: [CXF-6959] Workaround for bug when loading
XmlSchema instance
Posted by cs...@apache.org.
[CXF-6959] Workaround for bug when loading XmlSchema instance
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b733306d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b733306d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b733306d
Branch: refs/heads/3.1.x-fixes
Commit: b733306d06d844c4faab0faa5b6f00b530d01761
Parents: b84bd51
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Jul 4 16:56:27 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Jul 4 17:08:36 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b733306d/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
index b80ffe0..91d88d7 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
@@ -119,8 +119,8 @@ public class XMLTypeCreator extends AbstractTypeCreator {
String path = "/META-INF/cxf/aegis.xsd";
InputStream is = XMLTypeCreator.class.getResourceAsStream(path);
if (is != null) {
- SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
try {
+ SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
Schema aegisSchema = schemaFactory.newSchema(new StreamSource(is));
AEGIS_DOCUMENT_BUILDER_FACTORY.setSchema(aegisSchema);
} catch (Throwable e) {