cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [1/2] cxf git commit: [CXF-6411] Initial improvements
Date Tue, 19 May 2015 09:18:40 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 8c475c7cc -> 5d21522a4


[CXF-6411] Initial improvements


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7169c7d0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7169c7d0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7169c7d0

Branch: refs/heads/3.0.x-fixes
Commit: 7169c7d08e61ef95ca50820fd472d024f0e923ea
Parents: 8c475c7
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Tue May 19 10:13:50 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Tue May 19 10:18:19 2015 +0100

----------------------------------------------------------------------
 core/pom.xml                                             |  6 ++++++
 .../org/apache/cxf/internal/CXFAPINamespaceHandler.java  | 11 ++++++++---
 parent/pom.xml                                           |  8 ++++++++
 rt/frontend/jaxrs/pom.xml                                |  6 ++++++
 .../cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java     |  5 ++---
 rt/frontend/jaxws/pom.xml                                |  6 ++++++
 .../cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java     |  5 ++---
 systests/jaxrs/pom.xml                                   |  8 +++++++-
 .../cxf/systest/jaxrs/JAXRSBlueprintContextListener.java |  4 +++-
 .../test/resources/jaxrs_soap_blueprint/WEB-INF/web.xml  | 10 +++++++++-
 10 files changed, 57 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/7169c7d0/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 0b6b32d..3505c9c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -165,6 +165,12 @@
             <optional>true</optional>
         </dependency>
         <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>blueprint-parser</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
             <groupId>org.apache.ws.xmlschema</groupId>
             <artifactId>xmlschema-core</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/7169c7d0/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 6275ca3..507e1ca 100644
--- a/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
+++ b/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
@@ -26,6 +26,7 @@ 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;
@@ -36,9 +37,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"})
 public class CXFAPINamespaceHandler implements NamespaceHandler {    
     
     public URL getSchemaLocation(String namespace) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/7169c7d0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1814f50..d43478f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -176,6 +176,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.version.range>[1.0,2)</cxf.aries.version.range>
         <cxf.osgi.version>4.2.0</cxf.osgi.version>
         <cxf.karaf.version>2.4.0</cxf.karaf.version>
@@ -610,6 +611,13 @@
                 <scope>provided</scope>
             </dependency>
             <dependency>
+                <groupId>org.apache.aries.blueprint</groupId>
+                <artifactId>blueprint-parser</artifactId>
+                <version>${cxf.aries.parser.version}</version>
+                <scope>provided</scope>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.core</artifactId>
                 <version>${cxf.osgi.version}</version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/7169c7d0/rt/frontend/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index 7a4ed66..271e6bf 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -60,6 +60,12 @@
             <optional>true</optional>
         </dependency>
         <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>blueprint-parser</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/7169c7d0/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 7834228..c61ca4c 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,6 +30,7 @@ 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;
@@ -38,9 +39,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")
 public class JAXRSBPNamespaceHandler implements NamespaceHandler {
     private BlueprintContainer blueprintContainer;
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/7169c7d0/rt/frontend/jaxws/pom.xml
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml
index d82572e..85f678a 100644
--- a/rt/frontend/jaxws/pom.xml
+++ b/rt/frontend/jaxws/pom.xml
@@ -52,6 +52,12 @@
             <optional>true</optional>
         </dependency>
         <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>blueprint-parser</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/7169c7d0/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 4d3b58d..5233899 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,6 +26,7 @@ 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.frontend.blueprint.ClientProxyFactoryBeanDefinitionParser;
 import org.apache.cxf.frontend.blueprint.ServerFactoryBeanDefinitionParser;
@@ -35,9 +36,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")
 public class JAXWSBPNamespaceHandler implements NamespaceHandler {
     private BlueprintContainer blueprintContainer;
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/7169c7d0/systests/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 30fcf69..ea2f656 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -75,11 +75,17 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.web</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>blueprint-parser</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.noosgi</artifactId>
             <version>1.1.0</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/cxf/blob/7169c7d0/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSBlueprintContextListener.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSBlueprintContextListener.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSBlueprintContextListener.java
index 91d1a16..366a27e 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSBlueprintContextListener.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSBlueprintContextListener.java
@@ -20,6 +20,8 @@ package org.apache.cxf.systest.jaxrs;
 
 import java.net.URI;
 
+import javax.servlet.ServletContext;
+
 import org.apache.aries.blueprint.container.SimpleNamespaceHandlerSet;
 import org.apache.aries.blueprint.parser.NamespaceHandlerSet;
 import org.apache.aries.blueprint.web.BlueprintContextListener;
@@ -29,7 +31,7 @@ import org.apache.cxf.jaxws.blueprint.JAXWSBPNamespaceHandler;
 
 public class JAXRSBlueprintContextListener extends BlueprintContextListener {
     @Override
-    protected NamespaceHandlerSet getNamespaceHandlerSet(ClassLoader tccl) {
+    protected NamespaceHandlerSet getNamespaceHandlerSet(ServletContext sc, ClassLoader tccl)
{
         SimpleNamespaceHandlerSet set = new SimpleNamespaceHandlerSet();
         
         set.addNamespace(URI.create("http://cxf.apache.org/blueprint/core"),

http://git-wip-us.apache.org/repos/asf/cxf/blob/7169c7d0/systests/jaxrs/src/test/resources/jaxrs_soap_blueprint/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/resources/jaxrs_soap_blueprint/WEB-INF/web.xml b/systests/jaxrs/src/test/resources/jaxrs_soap_blueprint/WEB-INF/web.xml
index 22dfb3f..5018a6a 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_soap_blueprint/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_soap_blueprint/WEB-INF/web.xml
@@ -24,9 +24,17 @@
         <param-name>blueprintLocation</param-name>
         <param-value>jaxrs_soap_blueprint/WEB-INF/beans.xml</param-value>
     </context-param>
+    <context-param>
+        <param-name>blueprintNamespaceHandlers</param-name>
+        <param-value>
+            org.apache.cxf.internal.CXFAPINamespaceHandler,
+            org.apache.cxf.jaxrs.blueprint.JAXRSBPNamespaceHandler,
+            org.apache.cxf.jaxws.blueprint.JAXWSBPNamespaceHandler
+        </param-value>
+    </context-param>
     <listener>
         <listener-class>
-            org.apache.cxf.systest.jaxrs.JAXRSBlueprintContextListener
+            org.apache.aries.blueprint.web.BlueprintContextListener
         </listener-class>
     </listener>
     <servlet>


Mime
View raw message