[jboss-svn-commits] JBossWS SVN: r1078 - in branches/jbossws-1.0.3.SP1: . src/main/etc src/main/java/org/jboss/ws/deployment src/main/java/org/jboss/ws/server
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Sep 28 03:37:36 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-09-28 03:37:31 -0400 (Thu, 28 Sep 2006)
New Revision: 1078
Modified:
branches/jbossws-1.0.3.SP1/.classpath
branches/jbossws-1.0.3.SP1/build-thirdparty.xml
branches/jbossws-1.0.3.SP1/src/main/etc/jbossws-component-info.xml
branches/jbossws-1.0.3.SP1/src/main/etc/jbossws14-component-info.xml
branches/jbossws-1.0.3.SP1/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java
branches/jbossws-1.0.3.SP1/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
branches/jbossws-1.0.3.SP1/version.properties
Log:
[JBWS-1228] WebServices leaking redeployment
Modified: branches/jbossws-1.0.3.SP1/.classpath
===================================================================
--- branches/jbossws-1.0.3.SP1/.classpath 2006-09-28 06:13:18 UTC (rev 1077)
+++ branches/jbossws-1.0.3.SP1/.classpath 2006-09-28 07:37:31 UTC (rev 1078)
@@ -26,9 +26,6 @@
<classpathentry kind="lib" path="thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.x"/>
<classpathentry sourcepath="D:/cvs/jboss-branch/jboss-4.0.x/common/src/main" kind="lib" path="thirdparty/jboss-common.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-j2ee.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-jmx.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-system.jar"/>
<classpathentry kind="lib" path="thirdparty/ant.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
Modified: branches/jbossws-1.0.3.SP1/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.0.3.SP1/build-thirdparty.xml 2006-09-28 06:13:18 UTC (rev 1077)
+++ branches/jbossws-1.0.3.SP1/build-thirdparty.xml 2006-09-28 07:37:31 UTC (rev 1078)
@@ -34,16 +34,13 @@
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core}/lib/jboss-jmx.jar" dest="${thirdparty.dir}/jboss-jmx.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core}/lib/jboss-system.jar" dest="${thirdparty.dir}/jboss-system.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/>
@@ -90,14 +87,14 @@
<!-- The classpath for the jbossws core -->
<path id="jboss.core.classpath">
- <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss-j2ee.jar"/>
<pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
</path>
<!-- The classpath for the jboss integration -->
<path id="jboss.integration.classpath">
- <pathelement location="${thirdparty.dir}/jboss-jmx.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-system.jar"/>
+ <pathelement location="${jboss.lib}/jboss-jmx.jar"/>
+ <pathelement location="${jboss.lib}/jboss-system.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<pathelement location="${jboss.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
Modified: branches/jbossws-1.0.3.SP1/src/main/etc/jbossws-component-info.xml
===================================================================
--- branches/jbossws-1.0.3.SP1/src/main/etc/jbossws-component-info.xml 2006-09-28 06:13:18 UTC (rev 1077)
+++ branches/jbossws-1.0.3.SP1/src/main/etc/jbossws-component-info.xml 2006-09-28 07:37:31 UTC (rev 1078)
@@ -22,6 +22,9 @@
<import componentref="ibm-wsdl4j">
<compatible version="@ibm-wsdl4j@"/>
</import>
+ <import componentref="jboss/common">
+ <compatible version="@jboss-common@"/>
+ </import>
<import componentref="jboss/jbossxb">
<!-- not compatible with version="1.0.0.CR4" -->
<compatible version="@jboss-jbossxb@"/>
Modified: branches/jbossws-1.0.3.SP1/src/main/etc/jbossws14-component-info.xml
===================================================================
--- branches/jbossws-1.0.3.SP1/src/main/etc/jbossws14-component-info.xml 2006-09-28 06:13:18 UTC (rev 1077)
+++ branches/jbossws-1.0.3.SP1/src/main/etc/jbossws14-component-info.xml 2006-09-28 07:37:31 UTC (rev 1078)
@@ -22,6 +22,9 @@
<import componentref="ibm-wsdl4j">
<compatible version="@ibm-wsdl4j@"/>
</import>
+ <import componentref="jboss/common">
+ <compatible version="@jboss-common@"/>
+ </import>
<import componentref="jboss/jbossxb">
<!-- not compatible with version="1.0.0.CR4" -->
<compatible version="@jboss-jbossxb@"/>
@@ -31,6 +34,7 @@
</import>
<import componentref="jboss/jbossretro-rt">
<compatible version="1.0.0.GA"/>
+ <compatible version="1.0.2.GA"/>
<compatible version="@jboss-jbossretro@"/>
</import>
Modified: branches/jbossws-1.0.3.SP1/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java
===================================================================
--- branches/jbossws-1.0.3.SP1/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-09-28 06:13:18 UTC (rev 1077)
+++ branches/jbossws-1.0.3.SP1/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-09-28 07:37:31 UTC (rev 1078)
@@ -186,6 +186,9 @@
epManager.destroyServiceEndpoint(sepID);
}
}
+
+ // Remove meta data from cache
+ metaDataMap.remove(udi.url.toExternalForm());
}
}
Modified: branches/jbossws-1.0.3.SP1/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
===================================================================
--- branches/jbossws-1.0.3.SP1/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-09-28 06:13:18 UTC (rev 1077)
+++ branches/jbossws-1.0.3.SP1/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-09-28 07:37:31 UTC (rev 1078)
@@ -563,10 +563,10 @@
public void create() throws Exception
{
+ log.info("WebServices: " + ServiceEndpointManager.class.getPackage().getImplementationVersion());
MBeanServer server = getJMXServer();
if (server != null)
{
- log.debug("Create service endpoint manager");
server.registerMBean(this, OBJECT_NAME);
}
}
Modified: branches/jbossws-1.0.3.SP1/version.properties
===================================================================
--- branches/jbossws-1.0.3.SP1/version.properties 2006-09-28 06:13:18 UTC (rev 1077)
+++ branches/jbossws-1.0.3.SP1/version.properties 2006-09-28 07:37:31 UTC (rev 1078)
@@ -3,8 +3,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-1.0
-version.id=1.0.3.GA
-repository.id=1.0.3.GA
+version.id=1.0.3.SP1
+repository.id=1.0.3.SP1
implementation.title=JBoss Web Services (JBossWS)
implementation.url=http://www.jboss.org/products/jbossws
@@ -15,6 +15,7 @@
apache-xmlsec=1.3.0
ibm-wsdl4j=1.5.2jboss
javassist=3.3.0.GA
+jboss-common=snapshot-Branch_1_0
jboss-jbossxb=1.0.0.CR6
jboss-microcontainer=1.0.2
jboss-remoting=1.4.3.GA
@@ -25,8 +26,7 @@
apache-xalan=j_2.7.0
apache-xerces=2.7.1
jboss-backport-concurrent=2.1.0.GA
-jboss-jbossretro=1.0.2.GA
-jbossas-core=4.0.4.GA
+jboss-jbossretro=1.0.3.GA
junit=3.8.1
oswego-concurrent=1.3.4
qdox=1.4
More information about the jboss-svn-commits
mailing list