svn commit: r1157501 - in /axis/axis2/java/core/trunk/modules: parent/ saaj/ transport/http/ transport/http/src/org/apache/axis2/transport/http/ transport/http/test-resources/ transport/http/test-reso
Author: veithen
Date: Sun Aug 14 09:04:32 2011
New Revision: 1157501
URL: http://svn.apache.org/viewvc?rev=1157501&view=rev
Log:
AXIS2-5093: Properly release the HTTP connection if the server response is a
404 or another error where we don't process the response content.
Added:
axis/axis2/java/core/trunk/modules/transport/http/test/
axis/axis2/java/core/trunk/modules/transport/http/test-resources/
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/http/
axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/http/axis2.xml
(with props)
axis/axis2/java/core/trunk/modules/transport/http/test/org/
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
(with props)
Modified:
axis/axis2/java/core/trunk/modules/parent/pom.xml
axis/axis2/java/core/trunk/modules/saaj/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
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=1157501&r1=1157500&r2=1157501&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sun Aug 14 09:04:32 2011
@@ -919,6 +919,13 @@
commons-cli
${commons.cli.version}
+
+
+
+jetty
+jetty
+5.1.10
+
Modified: axis/axis2/java/core/trunk/modules/saaj/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/pom.xml?rev=1157501&r1=1157500&r2=1157501&view=diff
==
--- axis/axis2/java/core/trunk/modules/saaj/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/saaj/pom.xml Sun Aug 14 09:04:32 2011
@@ -81,7 +81,6 @@
jetty
jetty
-5.1.10
test
Modified: axis/axis2/java/core/trunk/modules/transport/http/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/pom.xml?rev=1157501&r1=1157500&r2=1157501&view=diff
==
--- axis/axis2/java/core/trunk/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/pom.xml Sun Aug 14
09:04:32 2011
@@ -40,6 +40,11 @@
src
test
+
+
+test-resources
+
+
maven-remote-resources-plugin
@@ -100,5 +105,10 @@
org.apache.httpcomponents
httpcore
+
+jetty
+jetty
+test
+
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java?rev=1157501&r1=1157500&r2=1157501&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
Sun Aug 14 09:04:32 2011
@@ -305,6 +305,8 @@ public class HTTPSender extends Abstract
method.getStatusText()));
}
} else {
+// Since we don't process the response, we must release the
connection immediately
+method.releaseConnection();
throw new AxisFault(Messages.getMessage("transportError",
String.valueOf(statusCode),
method.getStatusText()));
Added:
axis/axis2/java/core/trunk/m
svn commit: r1157506 - in /axis/axis2/java/core/branches/1_6: ./ modules/parent/ modules/saaj/ modules/transport/http/ modules/transport/http/src/org/apache/axis2/transport/http/ modules/transport/htt
Author: veithen Date: Sun Aug 14 09:55:23 2011 New Revision: 1157506 URL: http://svn.apache.org/viewvc?rev=1157506&view=rev Log: AXIS2-5093: Merged r1157501 to the 1.6 branch. Added: axis/axis2/java/core/branches/1_6/modules/transport/http/test/ - copied from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test/ axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/ - copied from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test-resources/ axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/org/ - copied from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/ axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/org/apache/ - copied from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/ axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/org/apache/axis2/ - copied from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/ axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/org/apache/axis2/transport/ - copied from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/ axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/org/apache/axis2/transport/http/ - copied from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/http/ axis/axis2/java/core/branches/1_6/modules/transport/http/test-resources/org/apache/axis2/transport/http/axis2.xml - copied unchanged from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test-resources/org/apache/axis2/transport/http/axis2.xml axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/ - copied from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test/org/ axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/ - copied from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/ axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/ - copied from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/ axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/transport/ - copied from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/ axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/transport/http/ - copied from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/ axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java - copied unchanged from r1157501, axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/modules/parent/pom.xml axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java Propchange: axis/axis2/java/core/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 14 09:55:23 2011 @@ -1 +1 @@ -/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1156305,1156382 +/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1156305,1156382,1157501 Modified: axi
svn commit: r1157517 - /axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java
Author: veithen
Date: Sun Aug 14 11:07:55 2011
New Revision: 1157517
URL: http://svn.apache.org/viewvc?rev=1157517&view=rev
Log:
Added a test case providing evidence for the issue described in AXIS2-5062.
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java?rev=1157517&r1=1157516&r2=1157517&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java
Sun Aug 14 11:07:55 2011
@@ -180,4 +180,25 @@ public class SOAPMessageDispatchTests ex
response.writeTo(System.out);
}
+/**
+ * Tests that HTTP connections are properly released if {@link
Dispatch#invokeOneWay(Object)} is
+ * used to invoke a service that actually uses the in-out MEP. This is a
regression test for
+ * AXIS2-5062.
+ *
+ * @throws Exception
+ */
+public void _testConnectionReleaseForInvokeOneWayWithMEPMismatch() throws
Exception {
+Service svc = Service.create(serviceName);
+svc.addPort(portName, null, url);
+Dispatch dispatch = svc.createDispatch(portName,
+SOAPMessage.class,
Service.Mode.MESSAGE);
+MessageFactory factory = MessageFactory.newInstance();
+SOAPMessage message = factory.createMessage();
+message.getSOAPBody().addBodyElement(new QName("urn:test", "test"));
+// If HTTP connections are not properly released, then this will end
up with a
+// ConnectionPoolTimeoutException.
+for (int i=0; i<200; i++) {
+dispatch.invokeOneWay(message);
+}
+}
}
svn commit: r1157522 - /axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
Author: veithen
Date: Sun Aug 14 12:47:42 2011
New Revision: 1157522
URL: http://svn.apache.org/viewvc?rev=1157522&view=rev
Log:
Forgot to give the unit test for AXIS2-5093 a meaningful name.
Modified:
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
Modified:
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java?rev=1157522&r1=1157521&r2=1157522&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
Sun Aug 14 12:47:42 2011
@@ -43,7 +43,7 @@ public class CommonsHTTPTransportSenderT
* @throws Exception
*/
@Test
-public void test() throws Exception {
+public void testConnectionReleaseWith404() throws Exception {
// Create a Jetty server instance without any contexts. It will always
return HTTP 404.
Server server = new Server();
SocketListener listener = new SocketListener();
svn commit: r1157523 - in /axis/axis2/java/core/branches/1_6: ./ modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
Author: veithen
Date: Sun Aug 14 12:49:05 2011
New Revision: 1157523
URL: http://svn.apache.org/viewvc?rev=1157523&view=rev
Log:
AXIS2-5093: Merged r1157522 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 14 12:49:05 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1156305,1156382,1157501
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1156305,1156382,1157501,1157522
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java?rev=1157523&r1=1157522&r2=1157523&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/http/test/org/apache/axis2/transport/http/CommonsHTTPTransportSenderTest.java
Sun Aug 14 12:49:05 2011
@@ -43,7 +43,7 @@ public class CommonsHTTPTransportSenderT
* @throws Exception
*/
@Test
-public void test() throws Exception {
+public void testConnectionReleaseWith404() throws Exception {
// Create a Jetty server instance without any contexts. It will always
return HTTP 404.
Server server = new Server();
SocketListener listener = new SocketListener();
svn commit: r1157535 - in /axis/axis2/java/core/trunk/modules: jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java jaxws/src/org/apache/axis2/jaxws/client/dispatch/Bas
Author: veithen
Date: Sun Aug 14 14:19:13 2011
New Revision: 1157535
URL: http://svn.apache.org/viewvc?rev=1157535&view=rev
Log:
AXIS2-5062:
* Committed the patch for BaseDispatch provided by Ivan.
* Enabled the corresponding test case.
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java?rev=1157535&r1=1157534&r2=1157535&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java
Sun Aug 14 14:19:13 2011
@@ -187,7 +187,7 @@ public class SOAPMessageDispatchTests ex
*
* @throws Exception
*/
-public void _testConnectionReleaseForInvokeOneWayWithMEPMismatch() throws
Exception {
+public void testConnectionReleaseForInvokeOneWayWithMEPMismatch() throws
Exception {
Service svc = Service.create(serviceName);
svc.addPort(portName, null, url);
Dispatch dispatch = svc.createDispatch(portName,
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java?rev=1157535&r1=1157534&r2=1157535&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
Sun Aug 14 14:19:13 2011
@@ -450,6 +450,7 @@ public abstract class BaseDispatch ex
public void invokeOneWay(Object obj) throws WebServiceException {
// All exceptions are caught and rethrown as a WebServiceException
+MessageContext requestMsgCtx = null;
try {
if (log.isDebugEnabled()) {
log.debug("Entered one-way invocation:
BaseDispatch.invokeOneWay()");
@@ -462,7 +463,7 @@ public abstract class BaseDispatch ex
// Create the MessageContext to hold the actual request message
and its
// associated properties
-MessageContext requestMsgCtx = new MessageContext();
+requestMsgCtx = new MessageContext();
requestMsgCtx.getAxisMessageContext().setProperty(BINDING_PROVIDER, this);
requestMsgCtx.setEndpointDescription(getEndpointDescription());
invocationContext.setRequestMessageContext(requestMsgCtx);
@@ -550,6 +551,18 @@ public abstract class BaseDispatch ex
" Exception caught: ", e);
}
throw ExceptionFactory.makeWebServiceException(e);
+} finally {
+// In all other cases we rely on freeInputStream to perform the
clean up. Since we don't expect
+// a response in the invokeOneWay case, we need to perform call
TransportSender#cleanup explicitly
+try {
+if (requestMsgCtx != null &&
requestMsgCtx.getAxisMessageContext() != null) {
+org.apache.axis2.context.MessageContext axisMsgCtx =
requestMsgCtx.getAxisMessageContext();
+if (axisMsgCtx.getTransportOut() != null &&
axisMsgCtx.getTransportOut().getSender() != null) {
+
axisMsgCtx.getTransportOut().getSender().cleanup(axisMsgCtx);
+}
+}
+} catch (Exception ignore) {
+}
}
}
svn commit: r1157613 - /axis/axis2/java/rampart/trunk/pom.xml
Author: veithen
Date: Sun Aug 14 19:46:21 2011
New Revision: 1157613
URL: http://svn.apache.org/viewvc?rev=1157613&view=rev
Log:
Removed xmlsec as a direct dependency so that it is retrieved as a transitive
dependency of WSS4J with the correct version (WSS4J currently uses xmlsec
1.4.5, but Rampart trunk was still at 1.4.2).
Modified:
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1157613&r1=1157612&r2=1157613&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sun Aug 14 19:46:21 2011
@@ -225,11 +225,6 @@
2.7.1
-org.apache.santuario
-xmlsec
-${xmlsec.version}
-
-
org.opensaml
opensaml1
1.1
@@ -423,7 +418,6 @@
1.2.13-SNAPSHOT
1.5.12-SNAPSHOT
-1.4.2
1.1
140
svn commit: r1157619 - in /axis/axis2/java/rampart/branches/1_6: ./ pom.xml
Author: veithen
Date: Sun Aug 14 19:56:01 2011
New Revision: 1157619
URL: http://svn.apache.org/viewvc?rev=1157619&view=rev
Log:
Merged r1157613 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 14 19:56:01 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613
Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1157619&r1=1157618&r2=1157619&view=diff
==
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Sun Aug 14 19:56:01 2011
@@ -229,11 +229,6 @@
2.7.1
-org.apache.santuario
-xmlsec
-${xmlsec.version}
-
-
org.opensaml
opensaml1
1.1
@@ -415,7 +410,6 @@
1.2.12
1.5.11
-1.4.2
1.1
140
svn commit: r1157658 - in /axis/axis2/java/rampart/branches/1_5_x: ./ pom.xml
Author: veithen
Date: Sun Aug 14 20:29:57 2011
New Revision: 1157658
URL: http://svn.apache.org/viewvc?rev=1157658&view=rev
Log:
Merged r1072178 to the 1.5 branch.
Modified:
axis/axis2/java/rampart/branches/1_5_x/ (props changed)
axis/axis2/java/rampart/branches/1_5_x/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_5_x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 14 20:29:57 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072182,1072187,1072313,1072316,1083686,1130570,1132548,1134683,1144616
+/axis/axis2/java/rampart/trunk:1072178,1072182,1072187,1072313,1072316,1083686,1130570,1132548,1134683,1144616
Modified: axis/axis2/java/rampart/branches/1_5_x/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1157658&r1=1157657&r2=1157658&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Sun Aug 14 20:29:57 2011
@@ -354,7 +354,7 @@
modules/documentation
modules/distribution
-
+
maven-assembly-plugin
@@ -399,7 +399,7 @@
1.2.12
1.5.10
- 1.4.2
+1.4.2
1.1
140
@@ -415,7 +415,7 @@
-
+
apache.snapshots.https
${distMgmtSnapshotsName}
${distMgmtSnapshotsUrl}
svn commit: r1157660 - in /axis/axis2/java/rampart/branches/1_5_x: ./ pom.xml
Author: veithen
Date: Sun Aug 14 20:39:08 2011
New Revision: 1157660
URL: http://svn.apache.org/viewvc?rev=1157660&view=rev
Log:
Merged r1157613 to the 1.5 branch.
Modified:
axis/axis2/java/rampart/branches/1_5_x/ (props changed)
axis/axis2/java/rampart/branches/1_5_x/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_5_x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 14 20:39:08 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072178,1072182,1072187,1072313,1072316,1083686,1130570,1132548,1134683,1144616
+/axis/axis2/java/rampart/trunk:1072178,1072182,1072187,1072313,1072316,1083686,1130570,1132548,1134683,1144616,1157613
Modified: axis/axis2/java/rampart/branches/1_5_x/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1157660&r1=1157659&r2=1157660&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Sun Aug 14 20:39:08 2011
@@ -223,11 +223,6 @@
2.7.1
-org.apache.santuario
-xmlsec
-${xmlsec.version}
-
-
org.opensaml
opensaml1
1.1
@@ -399,7 +394,6 @@
1.2.12
1.5.10
-1.4.2
1.1
140
svn commit: r1157670 - in /axis/axis2/java/rampart/trunk: modules/rampart-integration/pom.xml modules/rampart-integration/src/test/resources/log4j.properties modules/rampart-tests/pom.xml modules/ramp
Author: veithen
Date: Sun Aug 14 21:16:00 2011
New Revision: 1157670
URL: http://svn.apache.org/viewvc?rev=1157670&view=rev
Log:
Set up log4j to make the unit tests less verbose.
Added:
axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/log4j.properties
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties
axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1157670&r1=1157669&r2=1157670&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Sun Aug
14 21:16:00 2011
@@ -606,6 +606,14 @@
${junit.version}
compile
+
+org.slf4j
+slf4j-log4j12
+
+
+log4j
+log4j
+
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties?rev=1157670&r1=1157669&r2=1157670&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties
Sun Aug 14 21:16:00 2011
@@ -17,7 +17,7 @@
# under the License.
#
-log4j.rootCategory=INFO, CONSOLE
+log4j.rootCategory=ERROR, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
Modified: axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml?rev=1157670&r1=1157669&r2=1157670&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml Sun Aug 14
21:16:00 2011
@@ -74,6 +74,14 @@
rampart-core
${project.version}
+
+org.slf4j
+slf4j-log4j12
+
+
+log4j
+log4j
+
Added:
axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/log4j.properties
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/log4j.properties?rev=1157670&view=auto
==
---
axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/log4j.properties
(added)
+++
axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/log4j.properties
Sun Aug 14 21:16:00 2011
@@ -0,0 +1,25 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+log4j.rootCategory=ERROR, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d %-5p %c - %m%n
+
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1157670&r1=1157669&r2=1157670&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sun Aug 14 21:16:00 2011
@@ -251,45 +251,6 @@
2.3
-
-org.slf4j
-slf4j-log4j12
-1.5.5
-test
-
-
-log4j
-log4j
-${log4j.version}
-test
-
-
-
svn commit: r1157672 - /axis/axis2/java/rampart/trunk/pom.xml
Author: veithen
Date: Sun Aug 14 21:19:25 2011
New Revision: 1157672
URL: http://svn.apache.org/viewvc?rev=1157672&view=rev
Log:
Removed uniqueVersion=false because that option is no longer supported in Maven
3.0.
Modified:
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1157672&r1=1157671&r2=1157672&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sun Aug 14 21:19:25 2011
@@ -428,14 +428,4 @@
false
-
-
-
-apache.snapshots.https
-${distMgmtSnapshotsName}
-${distMgmtSnapshotsUrl}
-false
-
-
-
svn commit: r1157674 - /axis/axis2/java/rampart/trunk/pom.xml
Author: veithen
Date: Sun Aug 14 21:42:26 2011
New Revision: 1157674
URL: http://svn.apache.org/viewvc?rev=1157674&view=rev
Log:
Removed the unnecessary profile for JDK 1.4.
Modified:
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1157674&r1=1157673&r2=1157674&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sun Aug 14 21:42:26 2011
@@ -250,6 +250,11 @@
commons-lang
2.3
+
+bouncycastle
+bcprov-jdk15
+${bcprov.jdk15.version}
+
@@ -322,35 +327,6 @@
-jdk14
-
-true
-1.4
-
-
-
-bouncycastle
-bcprov-jdk14
-${bcprov.jdk14.version}
-
-
-
-
-
-jdk15
-
-1.5
-
-
-
-bouncycastle
-bcprov-jdk15
-${bcprov.jdk15.version}
-
-
-
-
-
apache-release
@@ -418,7 +394,6 @@
1.5.12-SNAPSHOT
1.1
-140
140
3.8.2
