[1/2] 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/2.7.x-fixes eb992c88a -> 90f90cbe8
[CXF-6246] Classes are in every version of the JDK we support, just use them
directly.
Conflicts:
rt/databinding/aegis/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5813258c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5813258c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5813258c
Branch: refs/heads/2.7.x-fixes
Commit: 5813258c98351511dea5a319199924954a97968f
Parents: eb992c8
Author: Daniel Kulp
Authored: Tue Feb 10 09:14:28 2015 -0500
Committer: Daniel Kulp
Committed: Tue Feb 10 09:27:22 2015 -0500
--
rt/databinding/aegis/pom.xml| 8 +-
.../cxf/aegis/type/java5/AnnotationReader.java | 27 +---
2 files changed, 14 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5813258c/rt/databinding/aegis/pom.xml
--
diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml
index 9569270..d3e581f 100644
--- a/rt/databinding/aegis/pom.xml
+++ b/rt/databinding/aegis/pom.xml
@@ -32,7 +32,13 @@
2.7.15-SNAPSHOT
../../../parent/pom.xml
-
+
+
+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}"
+
+
org.apache.cxf
http://git-wip-us.apache.org/repos/asf/cxf/blob/5813258c/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 bf06ed1..66299a0 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 WEB_PARAM =
load("javax.jws.WebParam");
-private static final Class WEB_RESULT =
load("javax.jws.WebResult");
+private static final Class WEB_PARAM =
javax.jws.WebParam.class;
+private static final Class WEB_RESULT =
javax.jws.WebResult.class;
private static final Class XML_ATTRIBUTE =
-load("javax.xml.bind.annotation.XmlAttribute");
+javax.xml.bind.annotation.XmlAttribute.class;
private static final Class XML_ELEMENT =
-load("javax.xml.bind.annotation.XmlElement");
+javax.xml.bind.annotation.XmlElement.class;
private static final Class XML_SCHEMA =
-load("javax.xml.bind.annotation.XmlSchema");
+javax.xml.bind.annotation.XmlSchema.class;
private static final Class XML_TYPE =
-load("javax.xml.bind.annotation.XmlType");
+javax.xml.bind.annotation.XmlType.class;
private static final Class XML_TRANSIENT =
-load("javax.xml.bind.annotation.XmlTransient");
+javax.xml.bind.annotation.XmlTransient.class;
@SuppressWarnings("unchecked")
public boolean isIgnored(AnnotatedElement element) {
@@ -378,15 +374,6 @@ public class AnnotationReader {
return null;
}
-private static Class 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) {
[2/2] cxf git commit: [CXF-6246] Classes are in every version of the JDK we support, just use them directly.
[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/bf9c5e3d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bf9c5e3d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bf9c5e3d
Branch: refs/heads/3.0.x-fixes
Commit: bf9c5e3dc83c5c7c63a578d8a336318f61f4db31
Parents: bcec16a
Author: Daniel Kulp
Authored: Tue Feb 10 09:14:28 2015 -0500
Committer: Daniel Kulp
Committed: Tue Feb 10 09:23:34 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/bf9c5e3d/rt/databinding/aegis/pom.xml
--
diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml
index 1b41535..8c3be18 100644
--- a/rt/databinding/aegis/pom.xml
+++ b/rt/databinding/aegis/pom.xml
@@ -30,6 +30,14 @@
3.0.4-SNAPSHOT
../../../parent/pom.xml
+
+
+
+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}"
+
+
org.apache.cxf
http://git-wip-us.apache.org/repos/asf/cxf/blob/bf9c5e3d/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 bf06ed1..66299a0 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 WEB_PARAM =
load("javax.jws.WebParam");
-private static final Class WEB_RESULT =
load("javax.jws.WebResult");
+private static final Class WEB_PARAM =
javax.jws.WebParam.class;
+private static final Class WEB_RESULT =
javax.jws.WebResult.class;
private static final Class XML_ATTRIBUTE =
-load("javax.xml.bind.annotation.XmlAttribute");
+javax.xml.bind.annotation.XmlAttribute.class;
private static final Class XML_ELEMENT =
-load("javax.xml.bind.annotation.XmlElement");
+javax.xml.bind.annotation.XmlElement.class;
private static final Class XML_SCHEMA =
-load("javax.xml.bind.annotation.XmlSchema");
+javax.xml.bind.annotation.XmlSchema.class;
private static final Class XML_TYPE =
-load("javax.xml.bind.annotation.XmlType");
+javax.xml.bind.annotation.XmlType.class;
private static final Class XML_TRANSIENT =
-load("javax.xml.bind.annotation.XmlTransient");
+javax.xml.bind.annotation.XmlTransient.class;
@SuppressWarnings("unchecked")
public boolean isIgnored(AnnotatedElement element) {
@@ -378,15 +374,6 @@ public class AnnotationReader {
return null;
}
-private static Class 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) {
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
Authored: Tue Feb 10 09:14:28 2015 -0500
Committer: Daniel Kulp
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 @@
3.1.0-SNAPSHOT
../../../parent/pom.xml
+
+
+
+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}"
+
+
org.apache.cxf
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 WEB_PARAM =
load("javax.jws.WebParam");
-private static final Class WEB_RESULT =
load("javax.jws.WebResult");
+private static final Class WEB_PARAM =
javax.jws.WebParam.class;
+private static final Class WEB_RESULT =
javax.jws.WebResult.class;
private static final Class XML_ATTRIBUTE =
-load("javax.xml.bind.annotation.XmlAttribute");
+javax.xml.bind.annotation.XmlAttribute.class;
private static final Class XML_ELEMENT =
-load("javax.xml.bind.annotation.XmlElement");
+javax.xml.bind.annotation.XmlElement.class;
private static final Class XML_SCHEMA =
-load("javax.xml.bind.annotation.XmlSchema");
+javax.xml.bind.annotation.XmlSchema.class;
private static final Class XML_TYPE =
-load("javax.xml.bind.annotation.XmlType");
+javax.xml.bind.annotation.XmlType.class;
private static final Class 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 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) {
