You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/05/09 22:30:08 UTC
svn commit: r1336379 [2/2] - in /axis/axis2/java/core/branches/AXIOM-420: ./
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb/src/org/apache/axis2/rpc/receivers/
modules/corba/src/org/apache/axis2/corba/receivers/ modules/integrati...
Modified: axis/axis2/java/core/branches/AXIOM-420/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIOM-420/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java?rev=1336379&r1=1336378&r2=1336379&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIOM-420/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java (original)
+++ axis/axis2/java/core/branches/AXIOM-420/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java Wed May 9 20:30:06 2012
@@ -26,7 +26,7 @@ import org.apache.axis2.context.MessageC
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.engine.Pingable;
-import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
+import org.apache.axis2.receivers.AbstractInOutMessageReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,7 +34,7 @@ import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.Iterator;
-public class PingMessageReceiver extends AbstractInOutSyncMessageReceiver implements PingConstants {
+public class PingMessageReceiver extends AbstractInOutMessageReceiver implements PingConstants {
private static Log log = LogFactory.getLog(PingMessageReceiver.class);
public void invokeBusinessLogic(MessageContext inMessage, MessageContext outMessage) throws AxisFault {
@@ -44,7 +44,7 @@ public class PingMessageReceiver extends
AxisOperation axisOperation;
PingResponse pingResponse = new PingResponse();
pingResponse.initPingResponse(inMessage);
- Iterator opListIterator = getAxisOperations(inMessage);
+ Iterator<AxisOperation> opListIterator = getAxisOperations(inMessage);
while (opListIterator.hasNext()) {
axisOperation = (AxisOperation) opListIterator.next();
@@ -75,9 +75,9 @@ public class PingMessageReceiver extends
* @return Iterator for the list of AxisOperations
* @throws AxisFault
*/
- private Iterator getAxisOperations(MessageContext inMessage) throws AxisFault {
+ private Iterator<AxisOperation> getAxisOperations(MessageContext inMessage) throws AxisFault {
boolean serviceLevel = false;
- Iterator operationsIterator;
+ Iterator<AxisOperation> operationsIterator;
OMElement element = null;
OMElement pingRequestElement = inMessage.getEnvelope().
@@ -95,8 +95,8 @@ public class PingMessageReceiver extends
if (!serviceLevel && element != null) {
//Operations to be pinged has been specified in the ping request
- Iterator elementIterator = pingRequestElement.getChildrenWithName(new QName(TAG_OPERATION));
- ArrayList operationList = new ArrayList();
+ Iterator<?> elementIterator = pingRequestElement.getChildrenWithName(new QName(TAG_OPERATION));
+ ArrayList<AxisOperation> operationList = new ArrayList<AxisOperation>();
AxisOperation axisOperation;
while (elementIterator.hasNext()) {
Modified: axis/axis2/java/core/branches/AXIOM-420/modules/scripting/src/org/apache/axis2/scripting/ScriptReceiver.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIOM-420/modules/scripting/src/org/apache/axis2/scripting/ScriptReceiver.java?rev=1336379&r1=1336378&r2=1336379&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIOM-420/modules/scripting/src/org/apache/axis2/scripting/ScriptReceiver.java (original)
+++ axis/axis2/java/core/branches/AXIOM-420/modules/scripting/src/org/apache/axis2/scripting/ScriptReceiver.java Wed May 9 20:30:06 2012
@@ -24,7 +24,7 @@ import org.apache.axis2.context.MessageC
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
+import org.apache.axis2.receivers.AbstractInOutMessageReceiver;
import org.apache.axis2.scripting.convertors.ConvertorFactory;
import org.apache.axis2.scripting.convertors.OMElementConvertor;
import org.apache.bsf.BSFEngine;
@@ -76,7 +76,7 @@ import java.util.ArrayList;
* The script language is determined by the file name suffix when using scripts
* in seperate files or the script parameter name suffix when using inline scripts.
*/
-public class ScriptReceiver extends AbstractInOutSyncMessageReceiver {
+public class ScriptReceiver extends AbstractInOutMessageReceiver {
public static final String SCRIPT_ATTR = "script";
public static final String FUNCTION_ATTR = "function";
@@ -161,7 +161,7 @@ public class ScriptReceiver extends Abst
}
} else {
// the script is defined inline within the services.xml
- ArrayList parameters = axisService.getParameters();
+ ArrayList<Parameter> parameters = axisService.getParameters();
for (int i=0; scriptFileParam == null && i<parameters.size(); i++) {
Parameter p = (Parameter) parameters.get(i);
if (p.getName().startsWith("script.")) {
Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/webapp/src/main/java/org/apache/axis2/transport/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport:r1334586-1336377*
Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/webapp/src/main/java/org/apache/axis2/transport/http/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http:r1334586-1336377*
Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java:r1334586-1336377