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 2010/10/30 23:56:50 UTC
svn commit: r1029210 [3/3] - in /axis/axis2/java/core/branches/1_5: ./
modules/distribution/
modules/kernel/src/org/apache/axis2/transport/http/util/
modules/kernel/test/org/apache/axis2/transport/http/util/ modules/parent/
modules/saaj/ modules/saaj/s...
Modified: axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java?rev=1029210&r1=1029209&r2=1029210&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java Sat Oct 30 21:56:49 2010
@@ -19,10 +19,7 @@
package org.apache.axis2.saaj.integration;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import junit.framework.Assert;
import org.apache.axiom.attachments.Attachments;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
@@ -30,7 +27,18 @@ import org.apache.axis2.description.Para
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.receivers.AbstractInOutMessageReceiver;
+import org.apache.axis2.saaj.SAAJTestRunner;
+import org.apache.axis2.saaj.TestConstants;
+import org.apache.axis2.saaj.Validated;
import org.apache.axis2.util.Utils;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.w3c.dom.Node;
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
@@ -56,9 +64,11 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Iterator;
-public class IntegrationTest extends TestCase {
+@RunWith(SAAJTestRunner.class)
+public class IntegrationTest extends Assert {
static int port;
public static final QName SERVICE_NAME = new QName("Echo");
@@ -67,9 +77,7 @@ public class IntegrationTest extends Tes
public static final String SAAJ_REPO =
System.getProperty("basedir", ".") + "/" + "target/test-resources/saaj-repo";
- public IntegrationTest(String name) {
- super(name);
- }
+ private String lastSoapAction; // Stores the last SOAP action received by the server
protected static String getAddress() {
return "http://127.0.0.1:" +
@@ -77,28 +85,28 @@ public class IntegrationTest extends Tes
"/axis2/services/Echo";
}
- public static Test suite() {
- return new TestSetup(new TestSuite(IntegrationTest.class)) {
- public void setUp() throws Exception {
- port = UtilServer.start(SAAJ_REPO);
- AxisConfiguration axisCfg =
- UtilServer.getConfigurationContext().getAxisConfiguration();
- axisCfg.addParameter(new Parameter("enableMTOM", "optional"));
- axisCfg.addParameter(new Parameter("enableSwA", "optional"));
- }
-
- public void tearDown() throws Exception {
- UtilServer.stop();
- }
- };
+ @BeforeClass
+ public static void initUtilServer() throws Exception {
+ port = UtilServer.start(SAAJ_REPO);
+ AxisConfiguration axisCfg =
+ UtilServer.getConfigurationContext().getAxisConfiguration();
+ axisCfg.addParameter(new Parameter("enableMTOM", "optional"));
+ axisCfg.addParameter(new Parameter("enableSwA", "optional"));
+ }
+
+ @AfterClass
+ public static void shutDownUtilServer() throws Exception {
+ UtilServer.stop();
}
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
MessageReceiver mr = new AbstractInOutMessageReceiver() {
@Override
public void invokeBusinessLogic(MessageContext inMessage, MessageContext outMessage)
throws AxisFault {
+ lastSoapAction = inMessage.getSoapAction();
outMessage.setEnvelope(inMessage.getEnvelope());
Attachments inAttachments = inMessage.getAttachmentMap();
Attachments outAttachments = outMessage.getAttachmentMap();
@@ -116,65 +124,52 @@ public class IntegrationTest extends Tes
Utils.createSimpleService(SERVICE_NAME, mr, null, OPERATION_NAME));
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
UtilServer.unDeployService(SERVICE_NAME);
UtilServer.unDeployClientService();
}
+ @Validated @Test
+ public void testSendReceiveMessageWithEmptyNSPrefix() throws Exception {
+ MessageFactory mf = MessageFactory.newInstance();
+ SOAPMessage request = mf.createMessage();
- public void testSendReceiveMessageWithEmptyNSPrefix() {
- try {
- MessageFactory mf = MessageFactory.newInstance();
- SOAPMessage request = mf.createMessage();
-
- SOAPPart sPart = request.getSOAPPart();
- SOAPEnvelope env = sPart.getEnvelope();
- SOAPBody body = env.getBody();
-
- //Namespace prefix is empty
- body.addBodyElement(new QName("http://fakeNamespace2.org","echo"))
- .addTextNode("This is some text");
-
- SOAPConnection sCon = SOAPConnectionFactory.newInstance().createConnection();
- SOAPMessage response = sCon.call(request, getAddress());
- assertFalse(response.getAttachments().hasNext());
- assertEquals(0, response.countAttachments());
-
- String requestStr = printSOAPMessage(request);
- String responseStr = printSOAPMessage(response);
- assertTrue(responseStr.indexOf("echo") > -1);
- sCon.close();
- } catch (SOAPException e) {
- e.printStackTrace();
- fail("Unexpected Exception while running test: " + e);
- } catch (IOException e) {
- fail("Unexpected Exception while running test: " + e);
- }
+ SOAPPart sPart = request.getSOAPPart();
+ SOAPEnvelope env = sPart.getEnvelope();
+ SOAPBody body = env.getBody();
+
+ //Namespace prefix is empty
+ body.addBodyElement(new QName("http://fakeNamespace2.org","echo"))
+ .addTextNode("This is some text");
+
+ SOAPConnection sCon = SOAPConnectionFactory.newInstance().createConnection();
+ SOAPMessage response = sCon.call(request, getAddress());
+ assertFalse(response.getAttachments().hasNext());
+ assertEquals(0, response.countAttachments());
+
+ String requestStr = printSOAPMessage(request);
+ String responseStr = printSOAPMessage(response);
+ assertTrue(responseStr.indexOf("echo") > -1);
+ sCon.close();
}
-
- public void testSendReceiveSimpleSOAPMessage() {
- try {
- MessageFactory mf = MessageFactory.newInstance();
- SOAPMessage request = mf.createMessage();
-
- createSimpleSOAPPart(request);
-
- SOAPConnection sCon = SOAPConnectionFactory.newInstance().createConnection();
- SOAPMessage response = sCon.call(request, getAddress());
- assertFalse(response.getAttachments().hasNext());
- assertEquals(0, response.countAttachments());
-
- String requestStr = printSOAPMessage(request);
- String responseStr = printSOAPMessage(response);
- assertTrue(responseStr.indexOf("echo") != -1);
- sCon.close();
- } catch (SOAPException e) {
- e.printStackTrace();
- fail("Unexpected Exception while running test: " + e);
- } catch (IOException e) {
- fail("Unexpected Exception while running test: " + e);
- }
+ @Validated @Test
+ public void testSendReceiveSimpleSOAPMessage() throws Exception {
+ MessageFactory mf = MessageFactory.newInstance();
+ SOAPMessage request = mf.createMessage();
+
+ createSimpleSOAPPart(request);
+
+ SOAPConnection sCon = SOAPConnectionFactory.newInstance().createConnection();
+ SOAPMessage response = sCon.call(request, getAddress());
+ assertFalse(response.getAttachments().hasNext());
+ assertEquals(0, response.countAttachments());
+
+ String requestStr = printSOAPMessage(request);
+ String responseStr = printSOAPMessage(response);
+ assertTrue(responseStr.indexOf("echo") != -1);
+ sCon.close();
}
// TODO: it is not clear how this method can give predictable results,
@@ -189,6 +184,7 @@ public class IntegrationTest extends Tes
return responseStr;
}
+ @Validated @Test
public void testSendReceiveMessageWithAttachment() throws Exception {
MessageFactory mf = MessageFactory.newInstance();
SOAPMessage request = mf.createMessage();
@@ -247,61 +243,6 @@ public class IntegrationTest extends Tes
}
- public void testSendReceiveNonRefAttachment() throws Exception {
- MessageFactory mf = MessageFactory.newInstance();
- SOAPMessage request = mf.createMessage();
-
- //create the SOAPPart
- createSimpleSOAPPart(request);
-
- //Attach a text/plain object with the SOAP request
- String sampleMessage = "Sample Message: Hello World!";
- AttachmentPart textAttach = request.createAttachmentPart(sampleMessage, "text/plain");
- request.addAttachmentPart(textAttach);
-
- //Attach a java.awt.Image object to the SOAP request
- String jpgfilename =
- System.getProperty("basedir", ".") + "/" + "target/test-resources/axis2.jpg";
- File myfile = new File(jpgfilename);
- FileDataSource fds = new FileDataSource(myfile);
- DataHandler imageDH = new DataHandler(fds);
- AttachmentPart jpegAttach = request.createAttachmentPart(imageDH);
- jpegAttach.addMimeHeader("Content-Transfer-Encoding", "binary");
- jpegAttach.setContentType("image/jpg");
- request.addAttachmentPart(jpegAttach);
-
-
- SOAPConnection sCon = SOAPConnectionFactory.newInstance().createConnection();
- SOAPMessage response = sCon.call(request, getAddress());
-
- assertEquals(2, response.countAttachments());
-
- Iterator attachIter = response.getAttachments();
-
- while (attachIter.hasNext()) {
- AttachmentPart attachment = (AttachmentPart)attachIter.next();
- final Object content = attachment.getDataHandler().getContent();
- if (content instanceof String) {
- assertEquals(sampleMessage, (String)content);
- } else if (content instanceof ByteArrayInputStream) {
- ByteArrayInputStream bais = (ByteArrayInputStream)content;
- byte[] b = new byte[15000];
- final int lengthRead = bais.read(b);
- FileOutputStream fos =
- new FileOutputStream(new File(System.getProperty("basedir", ".") + "/" +
- "target/target/test-resources/axis2.jpg"));
- fos.write(b, 0, lengthRead);
- fos.flush();
- fos.close();
-
- assertTrue(attachment.getContentType().equals("image/jpeg")
- || attachment.getContentType().equals("text/plain"));
- }
- }
-
- sCon.close();
- }
-
private void createSOAPPart(SOAPMessage message) throws SOAPException {
SOAPPart sPart = message.getSOAPPart();
SOAPEnvelope env = sPart.getEnvelope();
@@ -370,33 +311,69 @@ public class IntegrationTest extends Tes
ele2.addTextNode("This is another text");
}
-
- public void testSendReceive_ISO88591_EncodedSOAPMessage() {
- try{
- MimeHeaders mimeHeaders = new MimeHeaders();
- mimeHeaders.addHeader("Content-Type", "text/xml; charset=iso-8859-1");
-
- FileInputStream fileInputStream = new FileInputStream(System.getProperty("basedir", ".") +
- "/test-resources" + File.separator + "soap-part-iso-8859-1.xml");
- SOAPMessage requestMessage = MessageFactory.newInstance().createMessage(mimeHeaders,fileInputStream);
-
-
- SOAPConnection sCon = SOAPConnectionFactory.newInstance().createConnection();
- SOAPMessage response = sCon.call(requestMessage, getAddress());
- assertFalse(response.getAttachments().hasNext());
- assertEquals(0, response.countAttachments());
-
- printSOAPMessage(requestMessage);
- String responseStr = printSOAPMessage(response);
- assertEquals("This is some text.Here are some special chars : \u00F6\u00C6\u00DA\u00AE\u00A4",
- response.getSOAPBody().getElementsByTagName("something").item(0).getTextContent());
- assertTrue(responseStr.indexOf("echo") != -1);
- sCon.close();
- } catch (SOAPException e) {
- e.printStackTrace();
- fail("Unexpected Exception while running test: " + e);
- } catch (IOException e) {
- fail("Unexpected Exception while running test: " + e);
- }
+ @Validated @Test
+ public void testSendReceive_ISO88591_EncodedSOAPMessage() throws Exception {
+ MimeHeaders mimeHeaders = new MimeHeaders();
+ mimeHeaders.addHeader("Content-Type", "text/xml; charset=iso-8859-1");
+
+ FileInputStream fileInputStream = new FileInputStream(System.getProperty("basedir", ".") +
+ "/test-resources" + File.separator + "soap-part-iso-8859-1.xml");
+ SOAPMessage requestMessage = MessageFactory.newInstance().createMessage(mimeHeaders,fileInputStream);
+
+
+ SOAPConnection sCon = SOAPConnectionFactory.newInstance().createConnection();
+ SOAPMessage response = sCon.call(requestMessage, getAddress());
+ assertFalse(response.getAttachments().hasNext());
+ assertEquals(0, response.countAttachments());
+
+ printSOAPMessage(requestMessage);
+ String responseStr = printSOAPMessage(response);
+ assertEquals("This is some text.Here are some special chars : \u00F6\u00C6\u00DA\u00AE\u00A4",
+ response.getSOAPBody().getElementsByTagName("something").item(0).getTextContent());
+ assertTrue(responseStr.indexOf("echo") != -1);
+ sCon.close();
}
+
+ @Validated @Test
+ public void testCallWithSOAPAction() throws Exception {
+ MessageFactory mf = MessageFactory.newInstance();
+ SOAPMessage request = mf.createMessage();
+
+ String soapAction = "urn:test:echo";
+
+ request.getSOAPPart().getEnvelope().getBody().addBodyElement(new QName("urn:test", "echo"));
+ request.getMimeHeaders().addHeader("SOAPAction", soapAction);
+
+ SOAPConnection sCon = SOAPConnectionFactory.newInstance().createConnection();
+ sCon.call(request, getAddress());
+ sCon.close();
+
+ assertEquals(soapAction, lastSoapAction);
+ }
+
+ @Validated @Test
+ public void testCallMTOM() throws Exception {
+ MessageFactory mf = MessageFactory.newInstance();
+
+ MimeHeaders headers = new MimeHeaders();
+ headers.addHeader("Content-Type", TestConstants.MTOM_TEST_MESSAGE_CONTENT_TYPE);
+ InputStream in = new FileInputStream(TestConstants.MTOM_TEST_MESSAGE_FILE);
+ SOAPMessage request = mf.createMessage(headers, in);
+ SOAPEnvelope envelope = request.getSOAPPart().getEnvelope();
+
+ // Remove the headers since they have mustunderstand=1
+ envelope.getHeader().removeContents();
+ // Change the name of the body content so that the request is routed to the echo service
+ ((SOAPElement)envelope.getBody().getChildElements().next()).setElementQName(new QName("echo"));
+
+ SOAPConnection sCon = SOAPConnectionFactory.newInstance().createConnection();
+ SOAPMessage response = sCon.call(request, getAddress());
+ sCon.close();
+
+ SOAPPart soapPart = response.getSOAPPart();
+ SOAPElement textElement =
+ (SOAPElement)soapPart.getEnvelope().getElementsByTagName("text").item(0);
+ AttachmentPart ap = response.getAttachment((SOAPElement)textElement.getChildNodes().item(0));
+ assertNotNull(ap);
+ }
}
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 21:56:49 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/module:922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452,1029153
-/webservices/axis2/trunk/java/modules/soapmonitor/module:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733676,751964,778060,780546,795431,805578,806085,806331,807512,816804,816812,817965,821686,821689,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/module:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751964,778060,780546,795431,805578,806085,806331,807512,816804,816812,817965,821686,821689,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 21:56:49 2010
@@ -1,3 +1,3 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:922914,922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452,1029153
/webservices/axis2/branches/java/1_5/modules/soapmonitor/pom.xml:745088,749052,749058,751161,751271,760467,765840
-/webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733676,751964,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751964,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 21:56:49 2010
@@ -1,3 +1,3 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:922914,922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452,1029153
/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/org/apache/axis2/handlers:745088,749052,749058,751161,751271,760467,765840
-/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733676,751964,777648,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751964,777648,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 21:56:49 2010
@@ -1,3 +1,3 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:922914,922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452,1029153
/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/META-INF/module.xml:745088,749052,749058,751161,751271,760467,765840
-/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733676,751964,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751964,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 21:56:49 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet:922914,965032,965056,965213,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452,1029153
-/webservices/axis2/trunk/java/modules/soapmonitor/servlet:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733676,751964,778060,780546,795431,805578,806085,806331,807512,816804,816812,817965,821686,821689,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751964,778060,780546,795431,805578,806085,806331,807512,816804,816812,817965,821686,821689,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 21:56:49 2010
@@ -1,3 +1,3 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:922914,965032,965056,965213,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452,1029153
/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/org/apache/axis2/soapmonitor/applet:745088,749052,749058,751161,751271,760467,765840
-/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733676,751964,777648,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751964,777648,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 21:56:49 2010
@@ -1,3 +1,3 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:922914,965032,965056,965213,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452,1029153
/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/org/apache/axis2/soapmonitor/servlet:745088,749052,749058,751161,751271,760467,765840
-/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733676,751964,777648,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751964,777648,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 21:56:49 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452,1029153
-/webservices/axis2/trunk/java/modules/transport/http/pom.xml:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539,733676,751964,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751964,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 21:56:49 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452,1029153
-/webservices/axis2/trunk/java/modules/transport/http/src:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539,733676,751964,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/src:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751964,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 21:56:49 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452,1029153
-/webservices/axis2/trunk/java/modules/transport/local:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539,733676,751964,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/local:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751964,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 21:56:49 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452,1029153
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539,733676,751964,761709,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751964,761709,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 21:56:49 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452,1029153
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539,733676,751964,761709,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751964,761709,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980