svn commit: r1336137 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
Author: sagara Date: Wed May 9 12:28:05 2012 New Revision: 1336137 URL: http://svn.apache.org/viewvc?rev=1336137&view=rev Log: Removed deprecated classes from 1.3 release. Removed: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
svn commit: r1336180 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
Author: sagara Date: Wed May 9 13:17:49 2012 New Revision: 1336180 URL: http://svn.apache.org/viewvc?rev=1336180&view=rev Log: Reverted r1336137. Added: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java - copied unchanged from r1336136, axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
svn commit: r1336271 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/rpc/receivers/ corba/src/org/apache/axis2/corba/receivers/ integration/test/org/apache/axis2/async/ integration/
Author: sagara
Date: Wed May 9 16:14:40 2012
New Revision: 1336271
URL: http://svn.apache.org/viewvc?rev=1336271&view=rev
Log:
Removed some classes deprecated from 1.3 and 1.4 releases.
Removed:
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaInOutAsyncMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Base64.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/engine/AbstractEngineTest.java
axis/axis2/java/core/trunk/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java
axis/axis2/java/core/trunk/modules/scripting/src/org/apache/axis2/scripting/ScriptReceiver.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java?rev=1336271&r1=1336270&r2=1336271&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
Wed May 9 16:14:40 2012
@@ -31,7 +31,7 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
-import org.apache.axis2.receivers.AbstractInOutAsyncMessageReceiver;
+import org.apache.axis2.receivers.AbstractInMessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFac
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-public class RPCInOutAsyncMessageReceiver extends
AbstractInOutAsyncMessageReceiver {
+public class RPCInOutAsyncMessageReceiver extends AbstractInMessageReceiver {
private static Log log = LogFactory.getLog(RPCInOnlyMessageReceiver.class);
@@ -67,7 +67,7 @@ public class RPCInOutAsyncMessageReceive
// get the implementation class for the Web Service
Object obj = getTheImplementationObject(inMessage);
-Class ImplClass = obj.getClass();
+Class ImplClass = obj.getClass();
AxisOperation op =
inMessage.getOperationContext().getAxisOperation();
AxisService service = inMessage.getAxisService();
@@ -137,7 +137,7 @@ public class RPCInOutAsyncMessageReceive
if (cause != null) {
msg = cause.getMessage();
}
-if (msg == null) {
+if (msg == null && method != null) {
msg = "Exception occurred while trying to invoke service
method " +
method.getName();
}
@@ -147,10 +147,20 @@ public class RPCInOutAsyncMessageReceive
}
throw new AxisFault(msg);
} catch (Exception e) {
-String msg = "Exception occurred while trying to invoke service
method " +
-method.getName();
-
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
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 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 getAxisOperations(MessageContext
inMessage) throws AxisFault {
boolean serviceLevel = false;
-Iterator operationsIterator;
+Iterator 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 operationList = new
ArrayList();
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
-Array
svn commit: r1336404 - in /axis/axis2/java/core/trunk: ./ modules/adb/src/org/apache/axis2/databinding/AbstractADBDataSource.java modules/adb/src/org/apache/axis2/databinding/utils/writer/ modules/adb
Author: veithen
Date: Wed May 9 21:15:03 2012
New Revision: 1336404
URL: http://svn.apache.org/viewvc?rev=1336404&view=rev
Log:
Let ADB use the feature introduced by AXIOM-420.
Removed:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/writer/
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/writer/
Modified:
axis/axis2/java/core/trunk/ (props changed)
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/AbstractADBDataSource.java
Propchange: axis/axis2/java/core/trunk/
--
Merged /axis/axis2/java/core/branches/AXIOM-420:r1334386-1336397
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/AbstractADBDataSource.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/AbstractADBDataSource.java?rev=1336404&r1=1336403&r2=1336404&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/AbstractADBDataSource.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/AbstractADBDataSource.java
Wed May 9 21:15:03 2012
@@ -18,31 +18,14 @@
*/
package org.apache.axis2.databinding;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.HashMap;
-
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDataSourceExt;
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.QNameAwareOMDataSource;
-import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareOMBuilder;
+import org.apache.axiom.om.ds.AbstractPushOMDataSource;
-public abstract class AbstractADBDataSource implements OMDataSourceExt,
QNameAwareOMDataSource {
+public abstract class AbstractADBDataSource extends AbstractPushOMDataSource
implements QNameAwareOMDataSource {
protected QName parentQName;
-
-HashMap map = null; // Map of properties
public AbstractADBDataSource(QName parentQName) {
this.parentQName = parentQName;
@@ -61,51 +44,6 @@ public abstract class AbstractADBDataSou
}
/**
- * @param output
- * @param format
- * @throws XMLStreamException
- * @see OMDataSource#serialize(java.io.OutputStream,
org.apache.axiom.om.OMOutputFormat)
- */
-public void serialize(OutputStream output, OMOutputFormat format) throws
XMLStreamException {
-XMLStreamWriter xmlStreamWriter =
StAXUtils.createXMLStreamWriter(output);
-serialize(xmlStreamWriter);
-xmlStreamWriter.flush();
-}
-
-/**
- * @param writer
- * @param format
- * @throws XMLStreamException
- * @see OMDataSource#serialize(java.io.Writer,
org.apache.axiom.om.OMOutputFormat)
- */
-public void serialize(Writer writer, OMOutputFormat format) throws
XMLStreamException {
-XMLStreamWriter xmlStreamWriter =
StAXUtils.createXMLStreamWriter(writer);
-serialize(xmlStreamWriter);
-xmlStreamWriter.flush();
-}
-
-/**
- * @throws XMLStreamException
- * @see org.apache.axiom.om.OMDataSource#getReader()
- */
-public XMLStreamReader getReader() throws XMLStreamException {
-MTOMAwareOMBuilder mtomAwareOMBuilder = new MTOMAwareOMBuilder();
-serialize(mtomAwareOMBuilder);
-return mtomAwareOMBuilder.getOMElement().getXMLStreamReader();
-}
-
-/**
- * Returns true if reading the backing object is destructive.
- * An example of an object with a destructive read is an InputSteam.
- * The owning OMSourcedElement uses this information to detemine if OM tree
- * expansion is needed when reading the OMDataSourceExt.
- * @return boolean
- */
-public boolean isDestructiveRead() {
-return false;
-}
-
-/**
* Returns true if writing the backing object is destructive.
* An example of an object with a destructive write is an InputStream.
* The owning OMSourcedElement uses this information to detemine if OM tree
@@ -116,55 +54,7 @@ public abstract class AbstractADBDataSou
return false;
}
-/**
- * Returns a InputStream representing the xml data
- * @param encoding String encoding of InputStream
- * @return InputStream
- */
-public InputStream getXMLInputStream(String encoding) throws
UnsupportedEncodingException {
-return new ByteArrayInputStream(getXMLBytes(encoding));
svn commit: r1336407 - /axis/axis2/java/core/branches/AXIOM-420/
Author: veithen Date: Wed May 9 21:17:26 2012 New Revision: 1336407 URL: http://svn.apache.org/viewvc?rev=1336407&view=rev Log: Deleted development branch that has been reintegrated into the trunk. Removed: axis/axis2/java/core/branches/AXIOM-420/
