cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r505186 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/helpers/ common/common/src/test/java/org/apache/cxf/helpers/ rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ rt/frontend/jaxws/src/test/java/org/apache/cxf/...
Date Fri, 09 Feb 2007 05:16:10 GMT
Author: ffang
Date: Thu Feb  8 21:16:09 2007
New Revision: 505186

URL: http://svn.apache.org/viewvc?view=rev&rev=505186
Log:
[CXF-382] Java package to wsdl namespace mapping incorrect
                        

Added:
    incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
  (with props)
Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/getGreetings.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo2.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo3.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echoResponse.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHi.xml

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/ServiceUtils.java?view=diff&rev=505186&r1=505185&r2=505186
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
(original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
Thu Feb  8 21:16:09 2007
@@ -120,7 +120,7 @@
             sb.append(word);
         }
 
-        return protocol + "://" + sb.toString();
+        return protocol + "://" + sb.toString() + "/";
     }
 
     /**

Added: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java?view=auto&rev=505186
==============================================================================
--- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
(added)
+++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
Thu Feb  8 21:16:09 2007
@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.cxf.helpers;
+
+import junit.framework.TestCase;
+
+public class ServiceUtilsTest extends TestCase {
+    public void testmakeNamespaceFromClassName() throws Exception {
+        String tns = ServiceUtils.makeNamespaceFromClassName("com.example.ws.Test", "http");
+        assertEquals("http://ws.example.com/", tns);
+    }
+}

Propchange: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java?view=diff&rev=505186&r1=505185&r2=505186
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
Thu Feb  8 21:16:09 2007
@@ -50,7 +50,7 @@
         Definition d = createService(false);
 
         Document wsdl = WSDLFactory.newInstance().newWSDLWriter().getDocument(d);
-        addNamespace("svc", "http://service.jaxws.cxf.apache.org");
+        addNamespace("svc", "http://service.jaxws.cxf.apache.org/");
         
         assertValid("/wsdl:definitions/wsdl:service[@name='Hello']", wsdl);
         assertValid("//wsdl:port/wsdlsoap:address[@location='" + address + "']", wsdl);
@@ -120,7 +120,7 @@
         
         assertNotNull(res);
        
-        addNamespace("h", "http://service.jaxws.cxf.apache.org");
+        addNamespace("h", "http://service.jaxws.cxf.apache.org/");
         assertValid("//s:Body/h:sayHiResponse/h:return", res);
         
         res = invoke("local://localhost:9090/hello", 
@@ -129,7 +129,7 @@
 
         assertNotNull(res);
         
-        addNamespace("h", "http://service.jaxws.cxf.apache.org");
+        addNamespace("h", "http://service.jaxws.cxf.apache.org/");
         assertValid("//s:Body/h:getGreetingsResponse/h:return/item", res);
     }
     

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/getGreetings.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/getGreetings.xml?view=diff&rev=505186&r1=505185&r2=505186
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/getGreetings.xml
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/getGreetings.xml
Thu Feb  8 21:16:09 2007
@@ -18,6 +18,6 @@
 -->
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
 	<soap:Body>
-		<getGreetings xmlns="http://service.jaxws.cxf.apache.org" />
+		<getGreetings xmlns="http://service.jaxws.cxf.apache.org/" />
 	</soap:Body>
 </soap:Envelope>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java?view=diff&rev=505186&r1=505185&r2=505186
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java
Thu Feb  8 21:16:09 2007
@@ -58,7 +58,7 @@
         svr.setAddress(address);
         svr.create();
 
-        addNamespace("h", "http://holder.jaxws.cxf.apache.org");
+        addNamespace("h", "http://holder.jaxws.cxf.apache.org/");
 
         Node response = invoke(address, LocalTransportFactory.TRANSPORT_ID, "echo.xml");
         

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo.xml?view=diff&rev=505186&r1=505185&r2=505186
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo.xml
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo.xml
Thu Feb  8 21:16:09 2007
@@ -18,7 +18,7 @@
 -->
 <s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
     <s:Body>
-        <echo xmlns="http://holder.jaxws.cxf.apache.org">
+        <echo xmlns="http://holder.jaxws.cxf.apache.org/">
             <s1>one</s1>
             <s2>two</s2>
         </echo>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo2.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo2.xml?view=diff&rev=505186&r1=505185&r2=505186
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo2.xml
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo2.xml
Thu Feb  8 21:16:09 2007
@@ -18,7 +18,7 @@
 -->
 <s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
     <s:Body>
-        <echo2 xmlns="http://holder.jaxws.cxf.apache.org">
+        <echo2 xmlns="http://holder.jaxws.cxf.apache.org/">
             <s1>one</s1>
             <s2>two</s2>
         </echo2>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo3.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo3.xml?view=diff&rev=505186&r1=505185&r2=505186
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo3.xml
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echo3.xml
Thu Feb  8 21:16:09 2007
@@ -17,7 +17,7 @@
 	under the License.
 -->
 <s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/"
-     xmlns="http://holder.jaxws.cxf.apache.org">
+     xmlns="http://holder.jaxws.cxf.apache.org/">
     <s:Header>
         <header>header</header>
     </s:Header>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echoResponse.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echoResponse.xml?view=diff&rev=505186&r1=505185&r2=505186
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echoResponse.xml
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/echoResponse.xml
Thu Feb  8 21:16:09 2007
@@ -18,7 +18,7 @@
 -->
 <s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
     <s:Body>
-        <echoResponse xmlns="http://holder.jaxws.cxf.apache.org">
+        <echoResponse xmlns="http://holder.jaxws.cxf.apache.org/">
             <return>one</return>
             <outS2>two</outS2>
         </echoResponse>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java?view=diff&rev=505186&r1=505185&r2=505186
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java
Thu Feb  8 21:16:09 2007
@@ -36,7 +36,7 @@
         assertNotNull(response);
         assertNoFault(response);
 
-        addNamespace("j", "http://service.jaxws.cxf.apache.org");
+        addNamespace("j", "http://service.jaxws.cxf.apache.org/");
         assertValid("//s:Body/j:sayHi", response);
     }
 }

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHi.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHi.xml?view=diff&rev=505186&r1=505185&r2=505186
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHi.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHi.xml Thu
Feb  8 21:16:09 2007
@@ -18,7 +18,7 @@
 -->
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
 	<soap:Body>
-	<sayHi xmlns="http://service.jaxws.cxf.apache.org">
+	<sayHi xmlns="http://service.jaxws.cxf.apache.org/">
 		<text>hi</text>
 	</sayHi>
 	</soap:Body>



Mime
View raw message