svn commit: r694993 - in /cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis: BeanWithCharacter.java CharacterSchemaTest.java SportsService.java SportsServiceImpl.java

[bi...@apache.org]

Author: bimargulies
Date: Sat Sep 13 10:45:49 2008
New Revision: 694993

URL: http://svn.apache.org/viewvc?rev=694993&view=rev
Log:
Don't try to borrow test class from Aegis.

Added:
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/BeanWithCharacter.java   (with props)
Modified:
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/SportsService.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java

Added: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/BeanWithCharacter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/BeanWithCharacter.java?rev=694993&view=auto
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/BeanWithCharacter.java (added)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/BeanWithCharacter.java Sat Sep 13 10:45:49 2008
@@ -0,0 +1,40 @@
+/**
+ * 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.systest.aegis;
+
+public class BeanWithCharacter {
+    private Character character;
+    private char primitiveCharacter;
+
+    public Character getCharacter() {
+        return character;
+    }
+
+    public void setCharacter(Character character) {
+        this.character = character;
+    }
+
+    public char getPrimitiveChar() {
+        return primitiveCharacter;
+    }
+
+    public void setPrimitiveChar(char pchar) {
+        this.primitiveCharacter = pchar;
+    }
+}

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/BeanWithCharacter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/BeanWithCharacter.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java?rev=694993&r1=694992&r2=694993&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java Sat Sep 13 10:45:49 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/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/SportsService.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/SportsService.java?rev=694993&r1=694992&r2=694993&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/SportsService.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/SportsService.java Sat Sep 13 10:45:49 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/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java?rev=694993&r1=694992&r2=694993&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java Sat Sep 13 10:45:49 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();
     }
 
 }