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 2015/02/10 15:18:20 UTC
cxf git commit: [CXF-6246] Classes are in every version of the JDK we
support, just use them directly.
Repository: cxf
Updated Branches:
refs/heads/master 8891549dc -> 824234e62
[CXF-6246] Classes are in every version of the JDK we support, just use them directly.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/824234e6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/824234e6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/824234e6
Branch: refs/heads/master
Commit: 824234e627f6205129b7f97e2fde7f1cf1f17093
Parents: 8891549
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Feb 10 09:14:28 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 10 09:18:09 2015 -0500
----------------------------------------------------------------------
rt/databinding/aegis/pom.xml | 8 ++++++
.../cxf/aegis/type/java5/AnnotationReader.java | 27 +++++---------------
2 files changed, 15 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/824234e6/rt/databinding/aegis/pom.xml
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml
index 83a6df3..59729e2 100644
--- a/rt/databinding/aegis/pom.xml
+++ b/rt/databinding/aegis/pom.xml
@@ -30,6 +30,14 @@
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+
+ <properties>
+ <cxf.osgi.import>
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.activation;version="${cxf.osgi.javax.activation.version}",
+ javax.xml.stream*;version="${cxf.osgi.javax.stream.version}"
+ </cxf.osgi.import>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/824234e6/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
index 56f6a7e..d4fcb5a 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
@@ -21,26 +21,22 @@ package org.apache.cxf.aegis.type.java5;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.cxf.aegis.type.AegisType;
-import org.apache.cxf.common.logging.LogUtils;
public class AnnotationReader {
- private static final Logger LOG = LogUtils.getL7dLogger(AnnotationReader.class);
- private static final Class<? extends Annotation> WEB_PARAM = load("javax.jws.WebParam");
- private static final Class<? extends Annotation> WEB_RESULT = load("javax.jws.WebResult");
+ private static final Class<? extends Annotation> WEB_PARAM = javax.jws.WebParam.class;
+ private static final Class<? extends Annotation> WEB_RESULT = javax.jws.WebResult.class;
private static final Class<? extends Annotation> XML_ATTRIBUTE =
- load("javax.xml.bind.annotation.XmlAttribute");
+ javax.xml.bind.annotation.XmlAttribute.class;
private static final Class<? extends Annotation> XML_ELEMENT =
- load("javax.xml.bind.annotation.XmlElement");
+ javax.xml.bind.annotation.XmlElement.class;
private static final Class<? extends Annotation> XML_SCHEMA =
- load("javax.xml.bind.annotation.XmlSchema");
+ javax.xml.bind.annotation.XmlSchema.class;
private static final Class<? extends Annotation> XML_TYPE =
- load("javax.xml.bind.annotation.XmlType");
+ javax.xml.bind.annotation.XmlType.class;
private static final Class<? extends Annotation> XML_TRANSIENT =
- load("javax.xml.bind.annotation.XmlTransient");
+ javax.xml.bind.annotation.XmlTransient.class;
public boolean isIgnored(AnnotatedElement element) {
return isAnnotationPresent(element,
@@ -362,15 +358,6 @@ public class AnnotationReader {
return null;
}
- private static Class<? extends Annotation> load(String name) {
- try {
- return AnnotationReader.class.getClassLoader().loadClass(name).asSubclass(Annotation.class);
- } catch (Throwable e) {
- LOG.log(Level.FINE, "Error loading annotation class " + name + ".", e);
- return null;
- }
- }
-
public boolean isFlat(Annotation[] annotations) {
if (annotations != null) {
for (Annotation a : annotations) {