svn commit: r1068781 - /axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml
Author: ruwan Date: Wed Feb 9 08:16:14 2011 New Revision: 1068781 URL: http://svn.apache.org/viewvc?rev=1068781&view=rev Log: Fixing the missing version changes Modified: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml Modified: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml?rev=1068781&r1=1068780&r2=1068781&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml Wed Feb 9 08:16:14 2011 @@ -127,7 +127,7 @@ org.apache.axis2 axis2-jaxws -SNAPSHOT +1.6.0-SNAPSHOT
svn commit: r1068785 - /axis/axis2/java/core/branches/1_6/modules/samples/book/pom.xml
Author: ruwan Date: Wed Feb 9 08:22:25 2011 New Revision: 1068785 URL: http://svn.apache.org/viewvc?rev=1068785&view=rev Log: fixing the versions Modified: axis/axis2/java/core/branches/1_6/modules/samples/book/pom.xml Modified: axis/axis2/java/core/branches/1_6/modules/samples/book/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/book/pom.xml?rev=1068785&r1=1068784&r2=1068785&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/book/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/book/pom.xml Wed Feb 9 08:22:25 2011 @@ -37,27 +37,27 @@ org.apache.axis2 axis2-kernel -SNAPSHOT +1.6.0-SNAPSHOT org.apache.axis2 axis2-codegen -SNAPSHOT +1.6.0-SNAPSHOT org.apache.axis2 axis2-adb -SNAPSHOT +1.6.0-SNAPSHOT org.apache.ws.commons.axiom axiom-api -SNAPSHOT +1.2.12-SNAPSHOT org.apache.ws.commons.axiom axiom-impl -SNAPSHOT +1.2.12-SNAPSHOT org.apache.ws.commons.schema @@ -67,7 +67,7 @@ org.apache.neethi neethi -SNAPSHOT +2.0.4 commons-logging @@ -112,12 +112,12 @@ org.apache.axis2 axis2-transport-http - SNAPSHOT + 1.6.0-SNAPSHOT org.apache.axis2 axis2-transport-local - SNAPSHOT + 1.6.0-SNAPSHOT
svn commit: r1068788 - in /axis/axis2/java/core/branches/1_6/modules: all/ rmi/ samples/book/ samples/java_first_jaxws/ samples/jaxws-addressbook/ samples/jaxws-calculator/ samples/jaxws-interop/ samp
Author: ruwan Date: Wed Feb 9 08:29:49 2011 New Revision: 1068788 URL: http://svn.apache.org/viewvc?rev=1068788&view=rev Log: fixing the versions on the branch Modified: axis/axis2/java/core/branches/1_6/modules/all/pom.xml axis/axis2/java/core/branches/1_6/modules/rmi/pom.xml axis/axis2/java/core/branches/1_6/modules/samples/book/pom.xml axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml axis/axis2/java/core/branches/1_6/modules/samples/jaxws-calculator/pom.xml axis/axis2/java/core/branches/1_6/modules/samples/jaxws-interop/pom.xml axis/axis2/java/core/branches/1_6/modules/samples/jaxws-samples/pom.xml axis/axis2/java/core/branches/1_6/modules/samples/jaxws-version/pom.xml axis/axis2/java/core/branches/1_6/modules/tool/axis2-java2wsdl-maven-plugin/src/test/test1/pom.xml axis/axis2/java/core/branches/1_6/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/pom.xml Modified: axis/axis2/java/core/branches/1_6/modules/all/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/all/pom.xml?rev=1068788&r1=1068787&r2=1068788&view=diff == --- axis/axis2/java/core/branches/1_6/modules/all/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/all/pom.xml Wed Feb 9 08:29:49 2011 @@ -5,7 +5,7 @@ org.apache.axis2 axis2-parent -SNAPSHOT +1.6.0-SNAPSHOT ../parent/pom.xml Modified: axis/axis2/java/core/branches/1_6/modules/rmi/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/rmi/pom.xml?rev=1068788&r1=1068787&r2=1068788&view=diff == --- axis/axis2/java/core/branches/1_6/modules/rmi/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/rmi/pom.xml Wed Feb 9 08:29:49 2011 @@ -27,7 +27,7 @@ org.apache.axis2 axis2-parent -SNAPSHOT +1.6.0-SNAPSHOT ../parent/pom.xml Modified: axis/axis2/java/core/branches/1_6/modules/samples/book/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/book/pom.xml?rev=1068788&r1=1068787&r2=1068788&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/book/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/book/pom.xml Wed Feb 9 08:29:49 2011 @@ -62,7 +62,7 @@ org.apache.ws.commons.schema XmlSchema -SNAPSHOT +1.4.7 org.apache.neethi Modified: axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml?rev=1068788&r1=1068787&r2=1068788&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml Wed Feb 9 08:29:49 2011 @@ -38,42 +38,42 @@ org.apache.axis2 axis2-kernel -SNAPSHOT +1.6.0-SNAPSHOT org.apache.axis2 axis2-jaxws -SNAPSHOT +1.6.0-SNAPSHOT org.apache.axis2 axis2-codegen -SNAPSHOT +1.6.0-SNAPSHOT org.apache.axis2 axis2-adb -SNAPSHOT +1.6.0-SNAPSHOT org.apache.ws.commons.axiom axiom-api -SNAPSHOT +1.2.12-SNAPSHOT org.apache.ws.commons.axiom axiom-impl -SNAPSHOT +1.2.12-SNAPSHOT org.apache.ws.commons.schema XmlSchema -SNAPSHOT +1.4.7 org.apache.neethi neethi -SNAPSHOT +2.0.4 commons-logging Modified: axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml?rev=1068788&r1=1068787&r2=1068788&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/jaxws-addressbook/pom.xml Wed Feb 9 08:29:49 2011 @@ -23,7 +23,7 @@ org.apache.axis2.samples jaxw
svn commit: r1068985 - in /axis/axis2/java/core/trunk/modules: jaxws/test/org/apache/axis2/jaxws/client/ jaxws/test/org/apache/axis2/jaxws/client/dispatch/ metadata/src/org/apache/axis2/jaxws/descript
Author: barrettj
Date: Wed Feb 9 17:13:37 2011
New Revision: 1068985
URL: http://svn.apache.org/viewvc?rev=1068985&view=rev
Log:
AXIS2-4952
Scope dynamic ports to the instance of the service that did the addPort(...).
Add TDD Unit test and flag to revert to previous behavior of sharing dynamic
ports across services.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DynamicPortCachingTests.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/MDQConstants.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java?rev=1068985&r1=1068984&r2=1068985&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
Wed Feb 9 17:13:37 2011
@@ -118,16 +118,27 @@ public class ReleaseServiceTests extends
* before the next one is created. This should release the resources for
that service. The
* number of services and ports created is large enough to cause an OOM if
the release isn't
* being done correctly.
+ *
+ * IMPORTANT NOTE! Due to a change where dynamic ports are not shared
across services,
+ * it *may* be that too many ports are being added, which could result in
an OOM before
+ * they can be released. The OOM does not necessarily indicate that the
services are
+ * not being released; it may indicate that the given number of dynamic
ports, now not
+ * shared across services, is too large. Even though the dynamic ports are
being relased
+ * the memory is not freed up for re-use until garbage collection is run.
+ *
+ * NOTE: This test is disabled because forcing garbage collection is an
inexact science
+ * at best. You can only ask the JVM to consider doing GC, and that
behaves differently
+ * on different JVMS. So, there's no reliable way to make sure this test
runs on various
+ * JVMs. So, it is disabled.
*/
-public void testMultipleServiceMultiplePortReleaseLoop() {
+public void _DISABLED_testMultipleServiceMultiplePortReleaseLoop() {
// Create a bunch of different services, make sure the service desc
finalizer is called
try {
ClientMetadataTest.installCachingFactory();
-
for (int i = 0; i < 1000; i++) {
QName svcQN = new QName(namespaceURI, svcLocalPart + "_" + i);
Service svc1 = Service.create(svcQN);
-for (int j = 0; j < 200; j++) {
+for (int j = 0; j < 100; j++) {
QName portQN = new QName(namespaceURI, dynamicPort1 +
"_svc_" + i + "_port_" + j);
svc1.addPort(portQN, bindingID1, epr1);
}
@@ -545,17 +556,17 @@ public class ReleaseServiceTests extends
EndpointDescription epDesc1_port1 =
svcDesc1.getEndpointDescription(portQN1, sd1);
EndpointDescription epDesc2_port1 =
svcDesc1.getEndpointDescription(portQN1, sd2);
-assertSame(epDesc1_port1, epDesc2_port1);
+assertNotSame(epDesc1_port1, epDesc2_port1);
AxisService axisSvc1_port1 = epDesc1_port1.getAxisService();
AxisService axisSvc2_port1 = epDesc2_port1.getAxisService();
-assertSame(axisSvc1_port1, axisSvc2_port1);
+assertNotSame(axisSvc1_port1, axisSvc2_port1);
EndpointDescription epDesc1_port2 =
svcDesc1.getEndpointDescription(portQN2, sd1);
EndpointDescription epDesc2_port2 =
svcDesc1.getEndpointDescription(portQN2, sd2);
-assertSame(epDesc1_port2, epDesc2_port2);
+assertNotSame(epDesc1_port2, epDesc2_port2);
AxisService axisSvc1_port2 = epDesc1_port2.getAxisService();
AxisService axisSvc2_port2 = epDesc2_port2.getAxisService();
-assertSame(axisSvc1_port2, axisSvc2_port2);
+assertNotSame(axisSvc1_port2, axisSvc2_port2);
// First close should NOT cleanup the endpoints since the other
service is
// still using them.
@@ -584,9 +595,9 @@ public class ReleaseServiceTests extends
ServiceDescription svcDesc3 = sd3.getServiceDescription();
assertSame(svcDesc2_afterClose, svcDesc3);
EndpointDescription epDesc3_port1 =
svcDesc3.getEndpointDescription(por
