cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r659148 - in /cxf/trunk: rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/ systests/src/test/java/org/apache/cxf/systest/aegis/ systests/src/test/resources/webapp/WEB-INF/
Date Thu, 22 May 2008 16:34:47 GMT
Author: bimargulies
Date: Thu May 22 09:34:46 2008
New Revision: 659148

URL: http://svn.apache.org/viewvc?rev=659148&view=rev
Log:
Some more testing of recent changes to attribute qualification in Aegis.

Modified:
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
    cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.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
    cxf/trunk/systests/src/test/resources/webapp/WEB-INF/beans.xml

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=659148&r1=659147&r2=659148&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Thu
May 22 09:34:46 2008
@@ -378,7 +378,8 @@
         return extraClass;
     }
 
-    private List<DOMResult> generateJaxbSchemas() throws IOException {
+    // default access for tests.
+    List<DOMResult> generateJaxbSchemas() throws IOException {
         final List<DOMResult> results = new ArrayList<DOMResult>();
 
         context.generateSchema(new SchemaOutputResolver() {

Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java?rev=659148&r1=659147&r2=659148&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
(original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
Thu May 22 09:34:46 2008
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.jaxb.fortest;
 
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(namespace = "uri:ultima:thule")
@@ -32,4 +33,30 @@
     public void setAriadne(String ariadne) {
         this.ariadne = ariadne;
     }
+    
+    @XmlAttribute
+    public String getDefaultAttribute() {
+        return "default";
+    }
+    
+    public void setDefaultAttribute(String val) {
+        //
+    }
+    
+    
+    @XmlAttribute(namespace = "")
+    public String getEmptyNamespaceAttribute() {
+        return "empty";
+    }
+    
+    public void setEmptyNamespaceAttribute() {
+    }
+
+    @XmlAttribute(namespace = "urn:xyzzy")
+    public String getExplicitNamespaceAttribute() {
+        return "explicit";
+    }
+    
+    public void setExplicitNamespaceAttribute() {
+    }
 }

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java?rev=659148&r1=659147&r2=659148&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
(original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
Thu May 22 09:34:46 2008
@@ -47,7 +47,7 @@
     
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(AegisServer.class, true));
+        assertTrue("server did not launch correctly", launchServer(AegisServer.class));
     }
     
     @Test
@@ -159,9 +159,11 @@
     public void testDynamicClient() throws Exception {
         DynamicClientFactory dcf = DynamicClientFactory.newInstance();
         Client client = dcf.createClient("http://localhost:9002/jaxwsAndAegisSports?wsdl");
+
         Object r = client.invoke("getAttributeBean")[0];
         Method getAddrPlainString = r.getClass().getMethod("getAttrPlainString");
         String s = (String)getAddrPlainString.invoke(r);
+
         assertEquals("attrPlain", s);
     }
 }

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=659148&r1=659147&r2=659148&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 Thu May
22 09:34:46 2008
@@ -22,11 +22,10 @@
 import java.util.Collection;
 
 import javax.jws.WebService;
-import javax.xml.ws.WebServiceException;
 
 @WebService(targetNamespace = "http://cxf.apache.org/systest/aegis/sports")
 public interface SportsService {
-    Collection<Team> getTeams() throws WebServiceException;
+    Collection<Team> getTeams();
     
     String testForMinOccurs0(String a, Integer b, String c);
     AttributeBean getAttributeBean();

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=659148&r1=659147&r2=659148&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 Thu
May 22 09:34:46 2008
@@ -23,15 +23,13 @@
 import java.util.Collection;
 import java.util.List;
 
-import javax.xml.ws.WebServiceException;
-
 /**
  * 
  */
 public class SportsServiceImpl implements SportsService {
 
     /** {@inheritDoc}*/
-    public Collection<Team> getTeams() throws WebServiceException {
+    public Collection<Team> getTeams() {
         List<Team> teams = new ArrayList<Team>();
         teams.add(new Team("Patriots", "New England"));
         return teams;

Modified: cxf/trunk/systests/src/test/resources/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/resources/webapp/WEB-INF/beans.xml?rev=659148&r1=659147&r2=659148&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/resources/webapp/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/src/test/resources/webapp/WEB-INF/beans.xml Thu May 22 09:34:46 2008
@@ -17,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!-- START SNIPPET: beans -->
 <!--beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:simple="http://cxf.apache.org/simple"
@@ -90,7 +89,6 @@
     </jaxws:serviceBean>
    </jaxws:server>  
    
-     
   <jaxws:server address="/jaxwsAndAegisSports"
     serviceClass="org.apache.cxf.systest.aegis.SportsService">
     <jaxws:dataBinding>
@@ -101,4 +99,3 @@
     </jaxws:serviceBean>
   </jaxws:server>
 </beans>
-<!-- END SNIPPET: beans -->



Mime
View raw message