cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r695495 - in /cxf/branches/2.1.x-fixes: ./ systests/src/test/java/org/apache/cxf/systest/aegis/
Date Mon, 15 Sep 2008 15:11:54 GMT
Author: dkulp
Date: Mon Sep 15 08:11:54 2008
New Revision: 695495

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

........
  r694993 | bimargulies | 2008-09-13 13:45:49 -0400 (Sat, 13 Sep 2008) | 2 lines
  
  Don't try to borrow test class from Aegis.
........

Added:
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/BeanWithCharacter.java
      - copied unchanged from r694993, cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/BeanWithCharacter.java
Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/SportsService.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 15 08:11:54 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,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987
+/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,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993

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

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java?rev=695495&r1=695494&r2=695495&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
Mon Sep 15 08:11:54 2008
@@ -61,7 +61,7 @@
         Document wsdl = testUtilities.getWSDLDocument(s); 
         assertNotNull(wsdl);
         NodeList typeAttrList = 
-            testUtilities.assertValid("//xsd:complexType[@name='SimpleBean']/xsd:sequence"
+            testUtilities.assertValid("//xsd:complexType[@name='BeanWithCharacter']/xsd:sequence"
                                       + "/xsd:element[@name='character']"
                                       + "/@type", 
                                       wsdl); 

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/SportsService.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/SportsService.java?rev=695495&r1=695494&r2=695495&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/SportsService.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/SportsService.java
Mon Sep 15 08:11:54 2008
@@ -23,15 +23,12 @@
 
 import javax.jws.WebService;
 
-import org.apache.cxf.aegis.services.SimpleBean;
-
 @WebService(targetNamespace = "http://cxf.apache.org/systest/aegis/sports")
 public interface SportsService {
     Collection<Team> getTeams();
     
     String testForMinOccurs0(String a, Integer b, String c);
     AttributeBean getAttributeBean();
-    // SimpleBean has relevant properties
-    SimpleBean getSimpleBean();
+    BeanWithCharacter getCharBean();
 }
 

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java?rev=695495&r1=695494&r2=695495&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java
Mon Sep 15 08:11:54 2008
@@ -23,8 +23,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.cxf.aegis.services.SimpleBean;
-
 /**
  * 
  */
@@ -45,8 +43,8 @@
         return new AttributeBean();
     }
 
-    public SimpleBean getSimpleBean() {
-        return new SimpleBean();
+    public BeanWithCharacter getCharBean() {
+        return new BeanWithCharacter();
     }
 
 }



Mime
View raw message