cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r631052 - in /incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis: AegisJaxWs.java AegisJaxWsImpl.java AegisJaxWsTest.java bean/AddItemWrapper.java bean/AnInterface.java bean/Item.java
Date Tue, 26 Feb 2008 01:16:35 GMT
Author: bimargulies
Date: Mon Feb 25 17:16:34 2008
New Revision: 631052

URL: http://svn.apache.org/viewvc?rev=631052&view=rev
Log:
keep trying to get somewhere near CXF-1448.

Added:
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AnInterface.java
  (with props)
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/Item.java
      - copied, changed from r630672, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AddItemWrapper.java
Removed:
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AddItemWrapper.java
Modified:
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java?rev=631052&r1=631051&r2=631052&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
Mon Feb 25 17:16:34 2008
@@ -26,7 +26,7 @@
 import javax.jws.WebParam;
 import javax.jws.WebService;
 
-import org.apache.cxf.systest.aegis.bean.AddItemWrapper;
+import org.apache.cxf.systest.aegis.bean.Item;
 
 /**
  * 
@@ -35,16 +35,17 @@
 public interface AegisJaxWs {
     @WebMethod
     @Oneway
-    void addItem(@WebParam(name = "item") AddItemWrapper item);
-
+    void addItem(@WebParam(name = "item")
+                 Item item);
 
     @WebMethod(operationName = "getItemsAsMap")
     Map getItemsMap();
-    
+
     @WebMethod(operationName = "getItemsAsMapSpecified")
-    Map<Integer, AddItemWrapper> getItemsMapSpecified();    
-    
+    Map<Integer, Item> getItemsMapSpecified();
+
     @WebMethod
-    AddItemWrapper getItemByKey(@WebParam(name = "key1") String key1, 
-                                @WebParam(name = "key2") String key2);
+    Item getItemByKey(@WebParam(name = "key1")
+                      String key1, @WebParam(name = "key2")
+                      String key2);
 }

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java?rev=631052&r1=631051&r2=631052&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
Mon Feb 25 17:16:34 2008
@@ -24,15 +24,15 @@
 import javax.jws.WebService;
 
 import org.apache.cxf.feature.Features;
-import org.apache.cxf.systest.aegis.bean.AddItemWrapper;
+import org.apache.cxf.systest.aegis.bean.Item;
 
 @Features(features = "org.apache.cxf.feature.LoggingFeature")
 @WebService (endpointInterface = "org.apache.cxf.systest.aegis.AegisJaxWs")
 public class AegisJaxWsImpl implements AegisJaxWs {
     
-    Map<Integer, AddItemWrapper> items = new HashMap<Integer, AddItemWrapper>();
+    Map<Integer, Item> items = new HashMap<Integer, Item>();
 
-    public void addItem(AddItemWrapper item) {
+    public void addItem(Item item) {
         items.put(item.getKey(), item);
     }
 
@@ -40,12 +40,12 @@
         return items;
     }
 
-    public Map<Integer, AddItemWrapper> getItemsMapSpecified() {
+    public Map<Integer, Item> getItemsMapSpecified() {
         return items;
     }
 
-    public AddItemWrapper getItemByKey(String key1, String key2) {
-        AddItemWrapper fake = new AddItemWrapper();
+    public Item getItemByKey(String key1, String key2) {
+        Item fake = new Item();
         fake.setKey(new Integer(33));
         fake.setData("and a third");
         return fake;

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java?rev=631052&r1=631051&r2=631052&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
Mon Feb 25 17:16:34 2008
@@ -24,7 +24,7 @@
 
 import org.apache.cxf.aegis.databinding.AegisDatabinding;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.apache.cxf.systest.aegis.bean.AddItemWrapper;
+import org.apache.cxf.systest.aegis.bean.Item;
 import org.junit.Test;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
@@ -56,23 +56,24 @@
     @Test
     public void testGetItem() throws Exception {
         setupForTest();
-        client.getItemByKey("a", "b");
+        Item item = client.getItemByKey("a", "b");
+        assertEquals(33, item.getKey().intValue());
     }
     
     @Test 
     public void testMapSpecified() throws Exception {
         setupForTest();
-        AddItemWrapper item = new AddItemWrapper();
+        Item item = new Item();
         item.setKey(new Integer(42));
         item.setData("Godzilla");
         client.addItem(item);
         
-        Map<Integer, AddItemWrapper> items = client.getItemsMapSpecified();
+        Map<Integer, Item> items = client.getItemsMapSpecified();
         assertNotNull(items);
         assertEquals(1, items.size());
-        Map.Entry<Integer, AddItemWrapper> entry = items.entrySet().iterator().next();
+        Map.Entry<Integer, Item> entry = items.entrySet().iterator().next();
         assertNotNull(entry);
-        AddItemWrapper item2 = entry.getValue();
+        Item item2 = entry.getValue();
         Integer key2 = entry.getKey();
         assertEquals(42, key2.intValue());
         assertEquals("Godzilla", item2.getData());

Added: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AnInterface.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AnInterface.java?rev=631052&view=auto
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AnInterface.java
(added)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AnInterface.java
Mon Feb 25 17:16:34 2008
@@ -0,0 +1,24 @@
+/**
+ * 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.bean;
+
+public interface AnInterface {
+    Integer getKey();
+    String getData();
+}

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

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

Copied: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/Item.java
(from r630672, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AddItemWrapper.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/Item.java?p2=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/Item.java&p1=incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AddItemWrapper.java&r1=630672&r2=631052&rev=631052&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AddItemWrapper.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/Item.java
Mon Feb 25 17:16:34 2008
@@ -19,10 +19,12 @@
 
 package org.apache.cxf.systest.aegis.bean;
 
+import java.io.Serializable;
+
 /**
  * 
  */
-public class AddItemWrapper {
+public class Item implements Serializable, AnInterface {
     private Integer key;
     private String data;
 



Mime
View raw message