You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/13 20:09:40 UTC
svn commit: r1231252 [3/3] - in /cxf/branches/2.5.x-fixes: ./
common/common/src/main/java/org/apache/cxf/helpers/
rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/ rt/databindin...
Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java Fri Jan 13 19:09:37 2012
@@ -19,7 +19,6 @@
package org.apache.cxf.systest.handlers;
import java.io.PrintStream;
-import java.util.Map;
import java.util.Set;
import javax.xml.namespace.QName;
@@ -44,9 +43,6 @@ public class LoggingHandler implements S
out = ps;
}
- public void init(Map c) {
- }
-
public Set<QName> getHeaders() {
return null;
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/ModifyNumberHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/ModifyNumberHandler.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/ModifyNumberHandler.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/ModifyNumberHandler.java Fri Jan 13 19:09:37 2012
@@ -49,7 +49,7 @@ public class ModifyNumberHandler impleme
Object payload = msg.getPayload(jaxbContext);
Object value = payload;
if (payload instanceof JAXBElement) {
- value = ((JAXBElement)payload).getValue();
+ value = ((JAXBElement<?>)payload).getValue();
}
if (value instanceof AddNumbers) {
Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SmallNumberHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SmallNumberHandler.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SmallNumberHandler.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SmallNumberHandler.java Fri Jan 13 19:09:37 2012
@@ -18,8 +18,6 @@
*/
package org.apache.cxf.systest.handlers;
-import java.util.Map;
-
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.xml.bind.JAXBContext;
@@ -72,7 +70,7 @@ public class SmallNumberHandler extends
JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
Object payload = msg.getPayload(jaxbContext);
if (payload instanceof JAXBElement) {
- payload = ((JAXBElement)payload).getValue();
+ payload = ((JAXBElement<?>)payload).getValue();
}
if (payload instanceof AddNumbers) {
@@ -99,7 +97,7 @@ public class SmallNumberHandler extends
payload = msg.getPayload(jaxbContext);
if (payload instanceof JAXBElement) {
- payload = ((JAXBElement)payload).getValue();
+ payload = ((JAXBElement<?>)payload).getValue();
}
AddNumbersResponse resp2 = (AddNumbersResponse)payload;
@@ -132,9 +130,6 @@ public class SmallNumberHandler extends
//System.out.println("LogicalHandler close called");
}
- public void init(Map config) {
- //System.out.println("LogicalHandler init called");
- }
public void destroy() {
//System.out.println("LogicalHandler close called");
Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java Fri Jan 13 19:09:37 2012
@@ -236,10 +236,6 @@ public class TestHandler<T extends Logic
methodCalled("close");
}
- public void init(Map arg0) {
- methodCalled("init");
- }
-
public void destroy() {
methodCalled("destroy");
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java Fri Jan 13 19:09:37 2012
@@ -184,7 +184,7 @@ public abstract class TestHandlerBase {
protected List<String> getHandlerInfoList(MessageContext ctx) {
List<String> handlerInfoList = null;
if (ctx.containsKey("handler.info")) {
- handlerInfoList = CastUtils.cast((List)ctx.get("handler.info"));
+ handlerInfoList = CastUtils.cast((List<?>)ctx.get("handler.info"));
} else {
handlerInfoList = new ArrayList<String>();
ctx.put("handler.info", handlerInfoList);
Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java Fri Jan 13 19:09:37 2012
@@ -19,7 +19,6 @@
package org.apache.cxf.systest.handlers;
-import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
@@ -58,8 +57,8 @@ import org.apache.cxf.Bus;
* @author <a href="mailto:codea@iona.com">codea</a>
* @version 1.0
*/
-public class TestSOAPHandler<T extends SOAPMessageContext> extends TestHandlerBase
- implements SOAPHandler<T> {
+public class TestSOAPHandler extends TestHandlerBase
+ implements SOAPHandler<SOAPMessageContext> {
@@ -178,11 +177,6 @@ public class TestSOAPHandler<T extends
return true;
}
- public final void init(final Map map) {
- methodCalled("init");
-
- }
-
public final void destroy() {
methodCalled("destroy");
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestUnusedHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestUnusedHandler.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestUnusedHandler.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestUnusedHandler.java Fri Jan 13 19:09:37 2012
@@ -18,8 +18,6 @@
*/
package org.apache.cxf.systest.handlers;
-import java.util.Map;
-
import javax.xml.ws.handler.LogicalHandler;
import javax.xml.ws.handler.LogicalMessageContext;
import javax.xml.ws.handler.MessageContext;
@@ -52,10 +50,6 @@ public class TestUnusedHandler<T extends
methodCalled("close");
}
- public void init(Map arg0) {
- methodCalled("init");
- }
-
public void destroy() {
methodCalled("destroy");
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java Fri Jan 13 19:09:37 2012
@@ -78,7 +78,7 @@ public class AttachmentStreamSourceXMLPr
}
Map<String, DataHandler> dataHandlers = CastUtils.cast(
- (Map)mc.get(MessageContext.INBOUND_MESSAGE_ATTACHMENTS));
+ (Map<?, ?>)mc.get(MessageContext.INBOUND_MESSAGE_ATTACHMENTS));
StringBuilder buf = new StringBuilder();
buf.append("<response>");
int i = 0;
@@ -114,7 +114,7 @@ public class AttachmentStreamSourceXMLPr
respHeaders.put(Message.CONTENT_TYPE, contentTypeValues);
Map<String, DataHandler> outDataHandlers
- = CastUtils.cast((Map)mc.get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS));
+ = CastUtils.cast((Map<?, ?>)mc.get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS));
byte[] data = new byte[50];
for (int x = 0; x < data.length; x++) {
data[x] = (byte)(x + (int)'0');
Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/TestSOAPHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/TestSOAPHandler.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/TestSOAPHandler.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/TestSOAPHandler.java Fri Jan 13 19:09:37 2012
@@ -44,13 +44,13 @@ public class TestSOAPHandler implements
SOAPEnvelope env = msg.getSOAPPart().getEnvelope();
SOAPBody body = env.getBody();
- Iterator it = body.getChildElements();
+ Iterator<?> it = body.getChildElements();
while (it.hasNext()) {
Object elem = it.next();
if (elem instanceof SOAPElement) {
- Iterator it2 = ((SOAPElement)elem).getChildElements();
+ Iterator<?> it2 = ((SOAPElement)elem).getChildElements();
while (it2.hasNext()) {
Object elem2 = it2.next();
if (elem2 instanceof SOAPElement) {
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java Fri Jan 13 19:09:37 2012
@@ -456,10 +456,10 @@ public class FailoverTest extends Abstra
try {
Definition def = bus.getExtension(WSDLManager.class)
.getDefinition(wsdlLocation);
- Map map = def.getAllServices();
+ Map<?, ?> map = def.getAllServices();
for (Object o : map.values()) {
Service service = (Service)o;
- Map ports = service.getPorts();
+ Map<?, ?> ports = service.getPorts();
for (Object p : ports.values()) {
Port port = (Port)p;
List<?> l = port.getExtensibilityElements();