You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/05/21 23:17:01 UTC
cxf git commit: [CXF-6411] Temporarily disabling Namespaces
annotations
Repository: cxf
Updated Branches:
refs/heads/master 475d1f949 -> 67f165611
[CXF-6411] Temporarily disabling Namespaces annotations
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/67f16561
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/67f16561
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/67f16561
Branch: refs/heads/master
Commit: 67f165611178ac59531d774aec8fc2353bd0c8e5
Parents: 475d1f9
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Thu May 21 22:16:44 2015 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Thu May 21 22:16:44 2015 +0100
----------------------------------------------------------------------
.../apache/cxf/internal/CXFAPINamespaceHandler.java | 15 +++++++--------
parent/pom.xml | 2 +-
.../blueprint/ClusteringBPNamespaceHandler.java | 3 +--
.../cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java | 3 +--
.../cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java | 3 +--
.../frontend/blueprint/SimpleBPNamespaceHandler.java | 3 +--
.../client/blueprint/JAXRSBPNamespaceHandler.java | 3 +--
.../HTTPJettyTransportNamespaceHandler.java | 4 ++--
.../HttpNettyTransportNamespaceHandler.java | 4 ++--
.../cxf/transport/http/blueprint/HttpBPHandler.java | 3 +--
10 files changed, 18 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/67f16561/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java b/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
index 507e1ca..5ec6bc9 100644
--- a/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
+++ b/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
@@ -26,7 +26,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.aries.blueprint.NamespaceHandler;
-import org.apache.aries.blueprint.Namespaces;
import org.apache.aries.blueprint.ParserContext;
import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
import org.apache.cxf.bus.blueprint.BusDefinitionParser;
@@ -37,13 +36,13 @@ import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
-@Namespaces({"http://cxf.apache.org/blueprint/core",
- "http://cxf.apache.org/configuration/beans",
- "http://cxf.apache.org/configuration/parameterized-types",
- "http://cxf.apache.org/configuration/security",
- "http://schemas.xmlsoap.org/wsdl/",
- "http://www.w3.org/2005/08/addressing",
- "http://schemas.xmlsoap.org/ws/2004/08/addressing"})
+//@Namespaces({"http://cxf.apache.org/blueprint/core",
+// "http://cxf.apache.org/configuration/beans",
+// "http://cxf.apache.org/configuration/parameterized-types",
+// "http://cxf.apache.org/configuration/security",
+// "http://schemas.xmlsoap.org/wsdl/",
+// "http://www.w3.org/2005/08/addressing",
+// "http://schemas.xmlsoap.org/ws/2004/08/addressing"})
public class CXFAPINamespaceHandler implements NamespaceHandler {
public URL getSchemaLocation(String namespace) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/67f16561/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6c26b6c..3069353 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -162,7 +162,7 @@
<cxf.hibernate-validator.bundle.version>5.0.2.Final_1</cxf.hibernate-validator.bundle.version>
<!-- various OSGi related versions -->
<cxf.aries.version>1.0.0</cxf.aries.version>
- <cxf.aries.parser.version>1.3.1-SNAPSHOT</cxf.aries.parser.version>
+ <cxf.aries.parser.version>1.3.0</cxf.aries.parser.version>
<cxf.aries.version.range>[1.0,2)</cxf.aries.version.range>
<cxf.osgi.version>4.2.0</cxf.osgi.version>
<cxf.karaf.version>3.0.2</cxf.karaf.version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/67f16561/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
index 336d0ff..06c81c5 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandler.java
@@ -25,7 +25,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.aries.blueprint.NamespaceHandler;
-import org.apache.aries.blueprint.Namespaces;
import org.apache.aries.blueprint.ParserContext;
import org.apache.cxf.clustering.FailoverFeature;
import org.apache.cxf.clustering.LoadDistributorFeature;
@@ -33,7 +32,7 @@ import org.apache.cxf.configuration.blueprint.SimpleBPBeanDefinitionParser;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
-@Namespaces("http://cxf.apache.org/clustering")
+//@Namespaces("http://cxf.apache.org/clustering")
public class ClusteringBPNamespaceHandler implements NamespaceHandler {
public ComponentMetadata decorate(Node node, ComponentMetadata component, ParserContext context) {
return null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/67f16561/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
index c61ca4c..a02c512 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
@@ -30,7 +30,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.aries.blueprint.NamespaceHandler;
-import org.apache.aries.blueprint.Namespaces;
import org.apache.aries.blueprint.ParserContext;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
@@ -39,7 +38,7 @@ import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
-@Namespaces("http://cxf.apache.org/blueprint/jaxrs")
+//@Namespaces("http://cxf.apache.org/blueprint/jaxrs")
public class JAXRSBPNamespaceHandler implements NamespaceHandler {
private BlueprintContainer blueprintContainer;
http://git-wip-us.apache.org/repos/asf/cxf/blob/67f16561/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java
index 5af8126..2eac988 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java
@@ -26,7 +26,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.aries.blueprint.NamespaceHandler;
-import org.apache.aries.blueprint.Namespaces;
import org.apache.aries.blueprint.ParserContext;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.endpoint.Server;
@@ -39,7 +38,7 @@ import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
-@Namespaces("http://cxf.apache.org/blueprint/jaxws")
+//@Namespaces("http://cxf.apache.org/blueprint/jaxws")
public class JAXWSBPNamespaceHandler implements NamespaceHandler {
private BlueprintContainer blueprintContainer;
http://git-wip-us.apache.org/repos/asf/cxf/blob/67f16561/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java
index 0986896..0e38437 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java
@@ -26,13 +26,12 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.aries.blueprint.NamespaceHandler;
-import org.apache.aries.blueprint.Namespaces;
import org.apache.aries.blueprint.ParserContext;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
-@Namespaces("http://cxf.apache.org/blueprint/simple")
+//@Namespaces("http://cxf.apache.org/blueprint/simple")
public class SimpleBPNamespaceHandler implements NamespaceHandler {
private BlueprintContainer blueprintContainer;
http://git-wip-us.apache.org/repos/asf/cxf/blob/67f16561/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java
index d32fbe1..ebdf7b5 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java
@@ -26,13 +26,12 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.aries.blueprint.NamespaceHandler;
-import org.apache.aries.blueprint.Namespaces;
import org.apache.aries.blueprint.ParserContext;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
-@Namespaces("http://cxf.apache.org/blueprint/jaxrs-client")
+//@Namespaces("http://cxf.apache.org/blueprint/jaxrs-client")
public class JAXRSBPNamespaceHandler implements NamespaceHandler {
private BlueprintContainer blueprintContainer;
http://git-wip-us.apache.org/repos/asf/cxf/blob/67f16561/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java
index 98b3f1a..c39a9c5 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/HTTPJettyTransportNamespaceHandler.java
@@ -22,17 +22,17 @@ import java.net.URL;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.aries.blueprint.NamespaceHandler;
-import org.apache.aries.blueprint.Namespaces;
import org.apache.aries.blueprint.ParserContext;
import org.apache.cxf.common.logging.LogUtils;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
-@Namespaces("http://cxf.apache.org/transports/http-jetty/configuration")
+//@Namespaces("http://cxf.apache.org/transports/http-jetty/configuration")
public class HTTPJettyTransportNamespaceHandler implements NamespaceHandler {
public static final String JETTY_TRANSPORT = "http://cxf.apache.org/transports/http-jetty/configuration";
http://git-wip-us.apache.org/repos/asf/cxf/blob/67f16561/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/HttpNettyTransportNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/HttpNettyTransportNamespaceHandler.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/HttpNettyTransportNamespaceHandler.java
index 53bb0b7..8c08ac7 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/HttpNettyTransportNamespaceHandler.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/HttpNettyTransportNamespaceHandler.java
@@ -22,17 +22,17 @@ import java.net.URL;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.aries.blueprint.NamespaceHandler;
-import org.apache.aries.blueprint.Namespaces;
import org.apache.aries.blueprint.ParserContext;
import org.apache.cxf.common.logging.LogUtils;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
-@Namespaces("http://cxf.apache.org/transports/http-netty-server/configuration")
+//@Namespaces("http://cxf.apache.org/transports/http-netty-server/configuration")
public class HttpNettyTransportNamespaceHandler implements NamespaceHandler {
public static final String NETTY_SERVER_TRANSPORT =
http://git-wip-us.apache.org/repos/asf/cxf/blob/67f16561/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java
index 2cfe3fd..1ccfa42 100755
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java
@@ -26,12 +26,11 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.aries.blueprint.NamespaceHandler;
-import org.apache.aries.blueprint.Namespaces;
import org.apache.aries.blueprint.ParserContext;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
-@Namespaces("http://cxf.apache.org/transports/http/configuration")
+//@Namespaces("http://cxf.apache.org/transports/http/configuration")
public class HttpBPHandler implements NamespaceHandler {
public HttpBPHandler() {