cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [2/2] cxf git commit: [CXF-6411] Re-enabling the test
Date Tue, 16 Jun 2015 09:05:52 GMT
[CXF-6411] Re-enabling the test


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

Branch: refs/heads/3.0.x-fixes
Commit: 428674d790e840db77e0cdc3657f3f9f321733e8
Parents: 734498e
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Tue Jun 16 09:58:38 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Tue Jun 16 10:05:15 2015 +0100

----------------------------------------------------------------------
 .../cxf/internal/CXFAPINamespaceHandler.java      | 15 ++++++++-------
 parent/pom.xml                                    |  2 +-
 .../blueprint/ClusteringBPNamespaceHandler.java   |  3 ++-
 .../jaxrs/blueprint/JAXRSBPNamespaceHandler.java  |  3 ++-
 .../org/apache/cxf/jaxrs/utils/HttpUtilsTest.java | 16 ++++++++++++++++
 .../jaxws/blueprint/JAXWSBPNamespaceHandler.java  |  3 ++-
 .../blueprint/SimpleBPNamespaceHandler.java       |  3 ++-
 .../client/blueprint/JAXRSBPNamespaceHandler.java |  3 ++-
 .../HTTPJettyTransportNamespaceHandler.java       |  3 ++-
 .../HttpNettyTransportNamespaceHandler.java       |  3 ++-
 .../transport/http/blueprint/HttpBPHandler.java   |  3 ++-
 systests/jaxrs/pom.xml                            |  4 ++--
 .../systest/jaxrs/JAXRSSoapRestBlueprintTest.java | 18 ++++++++++--------
 13 files changed, 53 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/428674d7/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 5ec6bc9..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,13 +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"})
+@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/428674d7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 710973c..3382ff0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -176,7 +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.0</cxf.aries.parser.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>

http://git-wip-us.apache.org/repos/asf/cxf/blob/428674d7/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 06c81c5..336d0ff 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,6 +25,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.clustering.FailoverFeature;
 import org.apache.cxf.clustering.LoadDistributorFeature;
@@ -32,7 +33,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/428674d7/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 a02c512..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,7 +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")
+@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/428674d7/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
index 601765d..07bcf67 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
@@ -40,6 +40,22 @@ import org.junit.Test;
 public class HttpUtilsTest extends Assert {
 
     @Test
+    public void testResolveJarUrl() throws Exception {
+        String str = "jar:file:/home/sberyozkin/.m2/repository/org/apache/cxf/cxf-rt-transports-http/3.1.2-SNAPSHOT/cxf-rt-transports-http-3.1.2-SNAPSHOT.jar!/schemas/configuration/http-conf.xsd";
+        URI uri = URI.create(str); 
+        String systemIdUri = "common.xsd";
+        if ("jar".equals(uri.toURL().getProtocol())) {
+            int jarFragmentIndex = str.lastIndexOf('!');
+            if (jarFragmentIndex > 0 && jarFragmentIndex < str.length() - 1)
{
+                String jarUri = str.substring(0, jarFragmentIndex);
+                String oldFragment = str.substring(jarFragmentIndex + 1);
+                String newFragment = URI.create(oldFragment).resolve(systemIdUri).toString();
+                System.out.println(jarUri + "!" + newFragment);
+            }
+        }
+    }
+    
+    @Test
     public void testUrlDecode() {
         assertEquals("+ ", HttpUtils.urlDecode("%2B+"));
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/428674d7/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 1efaa50..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,7 +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")
+@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/428674d7/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 0e38437..0986896 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,12 +26,13 @@ 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/428674d7/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 ebdf7b5..d32fbe1 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,12 +26,13 @@ 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/428674d7/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 c39a9c5..852aebf 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
@@ -27,12 +27,13 @@ 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/428674d7/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 8c08ac7..0790375 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
@@ -27,12 +27,13 @@ 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/428674d7/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 1ccfa42..2cfe3fd 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,11 +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.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() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/428674d7/systests/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 4f8fe10..d5468c1 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -75,7 +75,7 @@
         <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>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.noosgi</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/428674d7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapRestBlueprintTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapRestBlueprintTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapRestBlueprintTest.java
index b610ece..8d2de8c 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapRestBlueprintTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapRestBlueprintTest.java
@@ -30,16 +30,18 @@ import org.apache.cxf.systest.jaxrs.jaxws.User;
 import org.apache.cxf.systest.jaxrs.jaxws.UserImpl;
 import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
 
+import org.junit.BeforeClass;
 import org.junit.Ignore;
+import org.junit.Test;
 
 public class JAXRSSoapRestBlueprintTest extends AbstractClientServerTestBase {
     public static final int PORT = BlueprintServer.PORT;
-//    @BeforeClass
-//    public static void beforeClass() throws Exception {
-//        // must be 'in-process' to communicate with inner class in single JVM
-//        // and to spawn class SpringServer w/o using main() method
-//        launchServer(BlueprintServer.class, true);
-//    }
+    @BeforeClass
+    public static void beforeClass() throws Exception {
+        // must be 'in-process' to communicate with inner class in single JVM
+        // and to spawn class SpringServer w/o using main() method
+        launchServer(BlueprintServer.class, true);
+    }
 
     @Ignore
     public static class BlueprintServer extends AbstractSpringServer {
@@ -48,7 +50,7 @@ public class JAXRSSoapRestBlueprintTest extends AbstractClientServerTestBase
{
             super("/jaxrs_soap_blueprint", "/bp", PORT);
         }
     }
-    //@Test
+    @Test
     public void testHelloRest() throws Exception {
         String address = "http://localhost:" + PORT + "/bp/services/hello-rest";
         
@@ -56,7 +58,7 @@ public class JAXRSSoapRestBlueprintTest extends AbstractClientServerTestBase
{
         useHelloService(service);
     }
     
-    //@Test
+    @Test
     public void testHelloSoap() throws Exception {
         final QName serviceName = new QName("http://hello.com", "HelloWorld");
         final QName portName = new QName("http://hello.com", "HelloWorldPort");


Mime
View raw message