JBossWS SVN: r5061 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-11-16 11:44:29 -0500 (Fri, 16 Nov 2007)
New Revision: 5061
Removed:
stack/native/tags/jbossws-native-2.0.1.CP01/
Log:
Couple of issue post testing slipped in.
16 years, 6 months
JBossWS SVN: r5060 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-11-16 11:25:20 -0500 (Fri, 16 Nov 2007)
New Revision: 5060
Added:
stack/native/tags/jbossws-native-2.0.1.CP01/
Log:
Tag for release.
Copied: stack/native/tags/jbossws-native-2.0.1.CP01 (from rev 5059, stack/native/branches/jbossws-native-2.0.1.CP)
16 years, 6 months
JBossWS SVN: r5059 - framework/branches/jbossws-framework-2.0.2/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-11-16 08:56:32 -0500 (Fri, 16 Nov 2007)
New Revision: 5059
Modified:
framework/branches/jbossws-framework-2.0.2/src/test/ant-import/build-testsuite.xml
Log:
Fix ejb3 client launcher classpath
Modified: framework/branches/jbossws-framework-2.0.2/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/branches/jbossws-framework-2.0.2/src/test/ant-import/build-testsuite.xml 2007-11-16 12:33:42 UTC (rev 5058)
+++ framework/branches/jbossws-framework-2.0.2/src/test/ant-import/build-testsuite.xml 2007-11-16 13:56:32 UTC (rev 5059)
@@ -121,6 +121,7 @@
<pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
<pathelement location="${jboss.client}/jboss-common-core.jar"/>
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
<pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
<pathelement location="${jboss.client}/jboss-metadata.jar"/>
<pathelement location="${jboss.client}/jboss-remoting.jar"/>
16 years, 6 months
JBossWS SVN: r5058 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-11-16 07:33:42 -0500 (Fri, 16 Nov 2007)
New Revision: 5058
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Update AS50 excludes
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-11-16 12:07:23 UTC (rev 5057)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-11-16 12:33:42 UTC (rev 5058)
@@ -3,8 +3,4 @@
# [JBAS-4930] Cannot lookup ejb3 remote proxy
org/jboss/test/ws/jaxrpc/jbws331/**
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.*
-
-# [JBAS-4931] Fix ejb3 ClientLaucher
-#org/jboss/test/ws/jaxws/webserviceref/**
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
\ No newline at end of file
16 years, 6 months
JBossWS SVN: r5057 - in stack/native/branches/jbossws-native-2.0.2/src/test: resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-11-16 07:07:23 -0500 (Fri, 16 Nov 2007)
New Revision: 5057
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Fix webserviceref stub properties
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2007-11-16 10:51:59 UTC (rev 5056)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2007-11-16 12:07:23 UTC (rev 5057)
@@ -57,16 +57,25 @@
if (args.length > 2)
password = args[2];
- SecureEndpoint port = secureService1.getSecureEndpointPort();
- String retMsg = invokeEndpoint(port, reqMsg, username, password);
-
- port = secureService2.getPort(SecureEndpoint.class);
- retMsg += "|" + invokeEndpoint(port, reqMsg, username, password);
-
- port = securePort1;
- retMsg += "|" + invokeEndpoint(port, reqMsg, username, password);
-
- retStr = retMsg;
+ if (reqMsg.equals("SecureService1"))
+ {
+ SecureEndpoint port = secureService1.getSecureEndpointPort();
+ retStr = invokeEndpoint(port, reqMsg, username, password);
+ }
+ else if (reqMsg.equals("SecureService2"))
+ {
+ SecureEndpoint port = secureService2.getPort(SecureEndpoint.class);
+ retStr = invokeEndpoint(port, reqMsg, username, password);
+ }
+ else if (reqMsg.equals("SecurePort1"))
+ {
+ SecureEndpoint port = securePort1;
+ retStr = invokeEndpoint(port, reqMsg, username, password);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Invalid req messge: " + reqMsg);
+ }
}
private static String invokeEndpoint(SecureEndpoint port, String inStr, String username, String password)
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-11-16 10:51:59 UTC (rev 5056)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-11-16 12:07:23 UTC (rev 5057)
@@ -73,17 +73,45 @@
assertEquals(helloWorld, retObj);
}
- public void testUnconfiguredStub() throws Throwable
+ public void testExplicitSecureService1() throws Throwable
{
- String reqMsg = "Hello World";
+ String reqMsg = "SecureService1";
new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" });
- assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr);
+ assertEquals(reqMsg, SecureEndpointClient.retStr);
}
- public void testConfiguredStub() throws Throwable
+ public void testExplicitSecureService2() throws Throwable
{
- String reqMsg = "Hello World";
+ String reqMsg = "SecureService2";
+ new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" });
+ assertEquals(reqMsg, SecureEndpointClient.retStr);
+ }
+
+ public void testExplicitSecurePort1() throws Throwable
+ {
+ String reqMsg = "SecurePort1";
+ new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" });
+ assertEquals(reqMsg, SecureEndpointClient.retStr);
+ }
+
+ public void testImplicitSecureService1() throws Throwable
+ {
+ String reqMsg = "SecureService1";
new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg });
- assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr);
+ assertEquals(reqMsg, SecureEndpointClient.retStr);
}
+
+ public void testImplicitSecureService2() throws Throwable
+ {
+ String reqMsg = "SecureService2";
+ new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg });
+ assertEquals(reqMsg, SecureEndpointClient.retStr);
+ }
+
+ public void testImplicitSecurePort1() throws Throwable
+ {
+ String reqMsg = "SecurePort1";
+ new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg });
+ assertEquals(reqMsg, SecureEndpointClient.retStr);
+ }
}
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-11-16 10:51:59 UTC (rev 5056)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-11-16 12:07:23 UTC (rev 5057)
@@ -7,5 +7,4 @@
org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.*
# [JBAS-4931] Fix ejb3 ClientLaucher
-org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.*
-org/jboss/test/ws/jaxws/webserviceref/**
+#org/jboss/test/ws/jaxws/webserviceref/**
16 years, 6 months
JBossWS SVN: r5056 - in legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core: server and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2007-11-16 05:51:59 -0500 (Fri, 16 Nov 2007)
New Revision: 5056
Modified:
legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
Log:
[JBWS-1860] Ported JBWS-1903 DOMUtils doesn't clear thread locals
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2007-11-16 10:31:24 UTC (rev 5055)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2007-11-16 10:51:59 UTC (rev 5056)
@@ -38,6 +38,7 @@
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import org.jboss.util.NotImplementedException;
+import org.jboss.ws.core.utils.DOMUtils;
import org.w3c.dom.Element;
/**
@@ -59,6 +60,7 @@
public ServiceDelegate createServiceDelegate(URL wsdlLocation, QName serviceName, Class serviceClass)
{
ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass);
+ DOMUtils.clearThreadLocals();
return delegate;
}
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-11-16 10:31:24 UTC (rev 5055)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-11-16 10:51:59 UTC (rev 5056)
@@ -67,6 +67,7 @@
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.SOAPConnectionImpl;
import org.jboss.ws.core.utils.ThreadLocalAssociation;
+import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
@@ -490,6 +491,8 @@
// clear thread local storage
ThreadLocalAssociation.clear();
+
+ DOMUtils.clearThreadLocals();
}
}
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-11-16 10:31:24 UTC (rev 5055)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-11-16 10:51:59 UTC (rev 5056)
@@ -95,6 +95,12 @@
{
}
+ public static void clearThreadLocals()
+ {
+ documentThreadLocal.remove();
+ builderThreadLocal.remove();
+ }
+
/** Initialise the the DocumentBuilder
*/
public static DocumentBuilder getDocumentBuilder()
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2007-11-16 10:31:24 UTC (rev 5055)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1860/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2007-11-16 10:51:59 UTC (rev 5056)
@@ -71,8 +71,8 @@
public static void clear()
{
- invokerMDBAssoc.set(null);
- msgContextAssoc.set(null);
- strTransformAssoc.set(null);
+ invokerMDBAssoc.remove();
+ msgContextAssoc.remove();
+ strTransformAssoc.remove();
}
}
16 years, 6 months
JBossWS SVN: r5055 - framework/branches/jbossws-framework-2.0.2/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-11-16 05:31:24 -0500 (Fri, 16 Nov 2007)
New Revision: 5055
Modified:
framework/branches/jbossws-framework-2.0.2/src/test/ant-import/build-testsuite.xml
Log:
Fix ejb3 client launcher classpath
Modified: framework/branches/jbossws-framework-2.0.2/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/branches/jbossws-framework-2.0.2/src/test/ant-import/build-testsuite.xml 2007-11-15 16:59:10 UTC (rev 5054)
+++ framework/branches/jbossws-framework-2.0.2/src/test/ant-import/build-testsuite.xml 2007-11-16 10:31:24 UTC (rev 5055)
@@ -120,9 +120,7 @@
<pathelement location="${jboss.client}/jaxws-tools.jar"/>
<pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
<pathelement location="${jboss.client}/jboss-common-core.jar"/>
- <pathelement location="${jboss.client}/jboss-container-metadata.jar"/>
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
<pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
<pathelement location="${jboss.client}/jboss-metadata.jar"/>
<pathelement location="${jboss.client}/jboss-remoting.jar"/>
@@ -149,6 +147,8 @@
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
<pathelement location="${jboss.client}/jaxb-xjc.jar"/>
+ <pathelement location="${jboss.client}/jboss-container-metadata.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
<pathelement location="${jboss.client}/jboss-metadata.jar"/>
<pathelement location="${jboss.client}/jboss-remoting.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
16 years, 6 months
JBossWS SVN: r5054 - in legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core: server and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2007-11-15 11:59:10 -0500 (Thu, 15 Nov 2007)
New Revision: 5054
Modified:
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
Log:
[JBPAPP-425] Ported JBWS-1903 DOMUtils doesn't clear thread locals
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2007-11-15 10:29:52 UTC (rev 5053)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2007-11-15 16:59:10 UTC (rev 5054)
@@ -38,6 +38,7 @@
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import org.jboss.util.NotImplementedException;
+import org.jboss.ws.core.utils.DOMUtils;
import org.w3c.dom.Element;
/**
@@ -59,6 +60,7 @@
public ServiceDelegate createServiceDelegate(URL wsdlLocation, QName serviceName, Class serviceClass)
{
ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass);
+ DOMUtils.clearThreadLocals();
return delegate;
}
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-11-15 10:29:52 UTC (rev 5053)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-11-15 16:59:10 UTC (rev 5054)
@@ -67,6 +67,7 @@
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.SOAPConnectionImpl;
import org.jboss.ws.core.utils.ThreadLocalAssociation;
+import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
@@ -490,6 +491,8 @@
// clear thread local storage
ThreadLocalAssociation.clear();
+
+ DOMUtils.clearThreadLocals();
}
}
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-11-15 10:29:52 UTC (rev 5053)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-11-15 16:59:10 UTC (rev 5054)
@@ -93,6 +93,12 @@
{
}
+ public static void clearThreadLocals()
+ {
+ documentThreadLocal.remove();
+ builderThreadLocal.remove();
+ }
+
/** Initialise the the DocumentBuilder
*/
public static DocumentBuilder getDocumentBuilder()
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2007-11-15 10:29:52 UTC (rev 5053)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2007-11-15 16:59:10 UTC (rev 5054)
@@ -71,8 +71,8 @@
public static void clear()
{
- invokerMDBAssoc.set(null);
- msgContextAssoc.set(null);
- strTransformAssoc.set(null);
+ invokerMDBAssoc.remove();
+ msgContextAssoc.remove();
+ strTransformAssoc.remove();
}
}
16 years, 6 months
JBossWS SVN: r5053 - in legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425: jbossws-core/src/java/org/jboss/ws/metadata/umdm and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2007-11-15 05:29:52 -0500 (Thu, 15 Nov 2007)
New Revision: 5053
Modified:
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/CommonBindingProvider.java
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.java
Log:
[JBPAPP-425] Ported JBWS-1833 - ConfigObserver was causing a memory leak
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/CommonBindingProvider.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/CommonBindingProvider.java 2007-11-15 04:12:56 UTC (rev 5052)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/core/CommonBindingProvider.java 2007-11-15 10:29:52 UTC (rev 5053)
@@ -55,6 +55,7 @@
{
this.epMetaData = epMetaData;
initBinding(epMetaData.getBindingId(), epMetaData.getType());
+ this.epMetaData.registerConfigObserver(this);
configure();
}
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-11-15 04:12:56 UTC (rev 5052)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-11-15 10:29:52 UTC (rev 5053)
@@ -52,6 +52,8 @@
import java.lang.reflect.Method;
import java.util.*;
+import java.lang.ref.WeakReference;
+
/**
* A Service component describes a set of endpoints.
*
@@ -604,9 +606,6 @@
if (config == null)
initEndpointConfig();
- // register any configurable with the ConfigProvider
- configObservable.addObserver(configurable);
-
// SOAPBinding configuration
if (configurable instanceof CommonBindingProvider)
{
@@ -715,11 +714,51 @@
class ConfigObservable extends Observable
{
+
+ private List<WeakReference<Observer>> observer = new ArrayList<WeakReference<Observer>>();
+
public void doNotify(Object object)
{
setChanged();
notifyObservers(object);
}
+
+ public synchronized void addObserver(Observer o)
+ {
+ observer.add( new WeakReference(o));
+ }
+
+ public synchronized void deleteObserver(Observer o)
+ {
+ for(WeakReference<Observer> w : observer)
+ {
+ Observer tmp = w.get();
+ if(tmp.equals(o))
+ {
+ observer.remove(o);
+ break;
+ }
+
+ }
+ }
+
+ public void notifyObservers()
+ {
+ notifyObservers(null);
+ }
+
+ public void notifyObservers(Object arg)
+ {
+ if(hasChanged())
+ {
+ for(WeakReference<Observer> w : observer)
+ {
+ Observer tmp = w.get();
+ tmp.update(this, arg);
+
+ }
+ }
+ }
}
public List<UnifiedPortComponentRefMetaData> getServiceRefContrib()
Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.java 2007-11-15 04:12:56 UTC (rev 5052)
+++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.java 2007-11-15 10:29:52 UTC (rev 5053)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxrpc.jbws626;
+import org.jboss.ws.core.CommonMessageContext;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -83,6 +85,10 @@
wasName = soapElement.getElementName();
assertElementName(expName, wasName);
}
+
+ // for testing the CommonBindingProvider memory leak. Not related to this test...
+ ((CommonMessageContext)msgContext).setModified(true);
+
}
catch (SOAPException ex)
{
16 years, 6 months
JBossWS SVN: r5052 - legacy/branches.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2007-11-14 23:12:56 -0500 (Wed, 14 Nov 2007)
New Revision: 5052
Added:
legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425/
Log:
Branch for [JBPAPP-425]
Copied: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-425 (from rev 5051, legacy/tags/jbossws-1.2.1.GA_CP01)
16 years, 6 months