Author: bimargulies
Date: Mon Feb 25 18:15:49 2008
New Revision: 631069
URL: http://svn.apache.org/viewvc?rev=631069&view=rev
Log:
Merged revisions 631052 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r631052 | bimargulies | 2008-02-25 20:16:34 -0500 (Mon, 25 Feb 2008) | 2 lines
keep trying to get somewhere near CXF-1448.
........
Added:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AnInterface.java
- copied unchanged from r631052,
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AnInterface.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/bean/Item.java
- copied unchanged from r631052,
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/bean/Item.java
Removed:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/bean/AddItemWrapper.java
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java?rev=631069&r1=631068&r2=631069&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
Mon Feb 25 18:15:49 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/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java?rev=631069&r1=631068&r2=631069&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
Mon Feb 25 18:15:49 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/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java?rev=631069&r1=631068&r2=631069&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
Mon Feb 25 18:15:49 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());
