svn commit: r1029308 - /axis/axis2/java/core/trunk/modules/parent/pom.xml
Author: veithen Date: Sun Oct 31 10:40:31 2010 New Revision: 1029308 URL: http://svn.apache.org/viewvc?rev=1029308&view=rev Log: Axis2 builds just fine without the java.net repository (presumably because the CXF project did all the hard work of bringing the SAAJ/JAXB/JAX-WS dependencies to Maven central...). Removed that repository so that the build uses only Maven central for release dependencies. Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1029308&r1=1029307&r2=1029308&view=diff == --- axis/axis2/java/core/trunk/modules/parent/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sun Oct 31 10:40:31 2010 @@ -424,45 +424,11 @@ - - - -java.net -http://download.java.net/maven/1 -legacy - -false - - -true -never - - +
svn commit: r1029316 - 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
Author: veithen Date: Sun Oct 31 11:53:12 2010 New Revision: 1029316 URL: http://svn.apache.org/viewvc?rev=1029316&view=rev Log: Merged r1029308 to the 1.5 branch. Axis2 1.5 also builds fine without the java.net repository. Modified: axis/axis2/java/core/branches/1_5/ (props changed) axis/axis2/java/core/branches/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/1_5/modules/parent/pom.xml axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) Propchange: axis/axis2/java/core/branches/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 31 11:53:12 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk: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,1029034,1029153 +/axis/axis2/java/core/trunk: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,1029034,1029153,1029308 /webservices/axis2/trunk/java:728674,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,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,889783,902271,904660,904780,905980 Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 31 11:53:12 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk/modules/distribution:922914,922941,922983,935169,935174,935338,93
svn commit: r1029372 - /axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
Author: veithen
Date: Sun Oct 31 14:40:21 2010
New Revision: 1029372
URL: http://svn.apache.org/viewvc?rev=1029372&view=rev
Log:
Modified SOAPConnectionImpl so that it creates a single ConfigurationContext
instance that will not be shared with others.
Reasons:
* Starting with r921685, if no ConfigurationContext is supplied to the
ServiceClient, it will create a new one (unless it can locate one using
MessageContext.getCurrentMessageContext(), but this is not the most common use
case for SOAPConnection). This means that SOAPConnection#call would create a
new ConfigurationContext every time, and this is too expensive.
* We need to disable mustUnderstand processing. However, we can't do that on an
AxisConfiguration that is shared with other components, because this would lead
to unpredictable results.
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java?rev=1029372&r1=1029371&r2=1029372&view=diff
==
---
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
Sun Oct 31 14:40:21 2010
@@ -32,6 +32,8 @@ import org.apache.axis2.addressing.Endpo
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.DispatchPhase;
@@ -76,8 +78,31 @@ public class SOAPConnectionImpl extends
/** Attribute which keeps track of whether this connection has been closed
*/
private boolean closed = false;
+private final ConfigurationContext configurationContext;
private ServiceClient serviceClient;
+SOAPConnectionImpl() throws SOAPException {
+// Create a new ConfigurationContext that will be used by all
ServiceClient instances.
+// There are two reasons why this is necessary:
+// * Starting with r921685, if no ConfigurationContext is supplied to
the ServiceClient,
+//it will create a new one (unless it can locate one using
MessageContext.getCurrentMessageContext(),
+//but this is not the most common use case for SOAPConnection).
This means that
+//SOAPConnection#call would create a new ConfigurationContext
every time, and this is
+//too expensive.
+// * We need to disable mustUnderstand processing. However, we can't
do that on an AxisConfiguration
+//that is shared with other components, because this would lead to
unpredictable results.
+// Note that we could also use a single ServiceClient instance, but
then the SOAPConnection
+// implementation would no longer be thread safe. Although thread
safety is not explicitly required
+// by the SAAJ specs, it appears that the SOAPConnection in Sun's
reference implementation is
+// thread safe.
+try {
+configurationContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(null,
null);
+
disableMustUnderstandProcessing(configurationContext.getAxisConfiguration());
+} catch (AxisFault ex) {
+throw new SOAPException(ex);
+}
+}
+
/**
* Sends the given message to the specified endpoint and blocks until it
has returned the
* response.
@@ -111,8 +136,7 @@ public class SOAPConnectionImpl extends
// initialize the Sender
OperationClient opClient;
try {
-serviceClient = new ServiceClient();
-
disableMustUnderstandProcessing(serviceClient.getAxisConfiguration());
+serviceClient = new ServiceClient(configurationContext, null);
opClient =
serviceClient.createClient(ServiceClient.ANON_OUT_IN_OP);
} catch (AxisFault e) {
throw new SOAPException(e);
@@ -220,11 +244,11 @@ public class SOAPConnectionImpl extends
*/
private void disableMustUnderstandProcessing(AxisConfiguration config) {
DispatchPhase phase;
-phase =
getDispatchPhase(serviceClient.getAxisConfiguration().getInFlowPhases());
+phase = getDispatchPhase(config.getInFlowPhases());
if (phase != null) {
phase.addHandler(new UnderstandAllHeadersHandler());
}
-phase =
getDispatchPhase(serviceClient.getAxisConfiguration().getInFaultFlowPhases());
+phase = g
svn commit: r1029377 - in /axis/axis2/java/core/trunk/modules/saaj: src/org/apache/axis2/saaj/SOAPConnectionImpl.java test/org/apache/axis2/saaj/integration/IntegrationTest.java
Author: veithen
Date: Sun Oct 31 15:09:18 2010
New Revision: 1029377
URL: http://svn.apache.org/viewvc?rev=1029377&view=rev
Log:
AXIS2-4752: Added a regression test and modified SOAPConnectionImpl to ensure
proper cleanup in all cases, in particular if the service returns a SOAP fault.
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java?rev=1029377&r1=1029376&r2=1029377&view=diff
==
---
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
Sun Oct 31 15:09:18 2010
@@ -79,7 +79,6 @@ public class SOAPConnectionImpl extends
private boolean closed = false;
private final ConfigurationContext configurationContext;
-private ServiceClient serviceClient;
SOAPConnectionImpl() throws SOAPException {
// Create a new ConfigurationContext that will be used by all
ServiceClient instances.
@@ -134,6 +133,7 @@ public class SOAPConnectionImpl extends
options.setTo(new EndpointReference(url.toString()));
// initialize the Sender
+ServiceClient serviceClient;
OperationClient opClient;
try {
serviceClient = new ServiceClient(configurationContext, null);
@@ -197,35 +197,38 @@ public class SOAPConnectionImpl extends
requestMsgCtx.setProperty(HTTPConstants.HTTP_HEADERS, httpHeaders);
}
-MessageContext responseMsgCtx;
try {
-requestMsgCtx.setEnvelope(envelope);
-opClient.addMessageContext(requestMsgCtx);
-opClient.execute(true);
-responseMsgCtx =
-
opClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
-} catch (AxisFault ex) {
-throw new SOAPException(ex.getMessage(), ex);
-}
-
-SOAPMessage response = getSOAPMessage(responseMsgCtx.getEnvelope());
-Attachments attachments = requestMsgCtx.getAttachmentMap();
-for (String contentId : attachments.getAllContentIDs()) {
-if (!contentId.equals(attachments.getSOAPPartContentID())) {
-AttachmentPart ap = response.createAttachmentPart(
-attachments.getDataHandler(contentId));
-ap.setContentId(contentId);
-response.addAttachmentPart(ap);
+MessageContext responseMsgCtx;
+try {
+requestMsgCtx.setEnvelope(envelope);
+opClient.addMessageContext(requestMsgCtx);
+opClient.execute(true);
+responseMsgCtx =
+
opClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+} catch (AxisFault ex) {
+throw new SOAPException(ex.getMessage(), ex);
+}
+
+SOAPMessage response =
getSOAPMessage(responseMsgCtx.getEnvelope());
+Attachments attachments = requestMsgCtx.getAttachmentMap();
+for (String contentId : attachments.getAllContentIDs()) {
+if (!contentId.equals(attachments.getSOAPPartContentID())) {
+AttachmentPart ap = response.createAttachmentPart(
+attachments.getDataHandler(contentId));
+ap.setContentId(contentId);
+response.addAttachmentPart(ap);
+}
+}
+
+return response;
+} finally {
+try {
+serviceClient.cleanupTransport();
+serviceClient.cleanup();
+} catch (AxisFault ex) {
+throw new SOAPException(ex);
}
}
-
-try {
-requestMsgCtx.getTransportOut().getSender().cleanup(requestMsgCtx);
-} catch (AxisFault axisFault) {
-// log error
-}
-
-return response;
}
private static boolean isMTOM(SOAPMessage soapMessage) {
@@ -270,16 +273,14 @@ public class SOAPConnectionImpl extends
* already closed
*/
public void close() throws SOAPException {
-if (serviceClient != null) {
-try {
-serviceClient.cleanup();
-} catch (AxisFault axisFault) {
-throw new SOAPException(axisFault.getMessage());
-}
-}
if (closed) {
throw new SOAPException("SOAPConnection Closed");
}
+
svn commit: r1029379 - 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
Author: veithen Date: Sun Oct 31 15:19:37 2010 New Revision: 1029379 URL: http://svn.apache.org/viewvc?rev=1029379&view=rev Log: Merged the latests updates for the AXIS2-4752 issue to the 1.5 branch. Modified: axis/axis2/java/core/branches/1_5/ (props changed) axis/axis2/java/core/branches/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/1_5/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java (props changed) axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) Propchange: axis/axis2/java/core/branches/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 31 15:19:37 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk: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,1029034,1029153,1029308 +/axis/axis2/java/core/trunk: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,1029034,1029153,1029308,1029372,1029377 /webservices/axis2/trunk/java:728674,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,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,889783,902271,904660,904780,905980 Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +
svn commit: r1029484 - /axis/axis2/java/transports/trunk/modules/mail/pom.xml
Author: veithen Date: Sun Oct 31 20:15:24 2010 New Revision: 1029484 URL: http://svn.apache.org/viewvc?rev=1029484&view=rev Log: Getting rid of the java.net repository. It is causing some strange issue in the Hudson build. Modified: axis/axis2/java/transports/trunk/modules/mail/pom.xml Modified: axis/axis2/java/transports/trunk/modules/mail/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/pom.xml?rev=1029484&r1=1029483&r2=1029484&view=diff == --- axis/axis2/java/transports/trunk/modules/mail/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/mail/pom.xml Sun Oct 31 20:15:24 2010 @@ -106,19 +106,11 @@ - - -java.net -Java.net Maven 2 Repository -http://download.java.net/maven/2 - - - javax.mail mail - 1.4.2 + 1.4.1
