cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r718559 - in /cxf/branches/2.1.x-fixes: ./ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest$CollectionService.aegis.xml rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
Date Tue, 18 Nov 2008 11:28:49 GMT
Author: ningjiang
Date: Tue Nov 18 03:28:47 2008
New Revision: 718559

URL: http://svn.apache.org/viewvc?rev=718559&view=rev
Log:
Merged revisions 717937,717961 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r717937 | bimargulies | 2008-11-16 06:23:02 +0800 (Sun, 16 Nov 2008) | 2 lines
  
  Remove unused xml file to reduce confusion.
........
  r717961 | bimargulies | 2008-11-16 09:29:05 +0800 (Sun, 16 Nov 2008) | 2 lines
  
  Finish neatening up after removing that file.
........

Removed:
    cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest$CollectionService.aegis.xml
Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 03:28:47 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354,709425,710076,710150,710154,71138
 8,711410,711490,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713804,713899,714167-714168,714245
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354,709425,710076,710150,710154,71138
 8,711410,711490,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713804,713899,714167-714168,714245,717937-717961

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java?rev=718559&r1=718558&r2=718559&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
Tue Nov 18 03:28:47 2008
@@ -185,17 +185,17 @@
     @Test
     public void testCollectionServiceWSDL() throws Exception {
         
-        createService(CollectionService.class, new CollectionService(), null);
+        createService(CollectionServiceInterface.class, new CollectionService(), null);
 
-        Document wsdl = getWSDLDocument("CollectionService");
+        Document wsdl = getWSDLDocument("CollectionServiceInterface");
         assertValid("//xsd:element[@name='return'][@type='tns:ArrayOfString']", wsdl);
     }
 
     @Test
     public void testUnannotatedStrings() throws Exception {        
-        createService(CollectionService.class, new CollectionService(), null);
+        createService(CollectionServiceInterface.class, new CollectionService(), null);
 
-        Document doc = getWSDLDocument("CollectionService");
+        Document doc = getWSDLDocument("CollectionServiceInterface");
         // printNode(doc);
         assertValid(
                     "//xsd:complexType[@name='getUnannotatedStringsResponse']"
@@ -205,8 +205,8 @@
     
     @Test
     public void testDoubleList() throws Exception {
-        createService(CollectionService.class, new CollectionService(), null);
-        Document doc = getWSDLDocument("CollectionService");
+        createService(CollectionServiceInterface.class, new CollectionService(), null);
+        Document doc = getWSDLDocument("CollectionServiceInterface");
         assertValid(
                     "//xsd:complexType[@name='ArrayOfDouble']"
                     + "/xsd:sequence/xsd:element[@type='xsd:double']",
@@ -216,14 +216,14 @@
     
     @Test
     public void testListTypes() throws Exception {
-        createService(CollectionService.class, new CollectionService(), null);
+        createService(CollectionServiceInterface.class, new CollectionService(), null);
         
         ClientProxyFactoryBean proxyFac = new ClientProxyFactoryBean();
         proxyFac.getServiceFactory().getServiceConfigurations().add(0, 
                                                               new XFireCompatibilityServiceConfiguration());
         proxyFac.setServiceClass(CollectionServiceInterface.class);
         proxyFac.setDataBinding(new AegisDatabinding());
-        proxyFac.setAddress("local://CollectionService");
+        proxyFac.setAddress("local://CollectionServiceInterface");
         proxyFac.setBus(getBus());
 
         CollectionServiceInterface csi = (CollectionServiceInterface)proxyFac.create();



Mime
View raw message