JBossWS SVN: r6024 - legacy/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-03-19 12:36:29 -0400 (Wed, 19 Mar 2008)
New Revision: 6024
Added:
legacy/branches/jbossws-1.2.1.GA_JBWS-2071/
Log:
[JBWS-2071] Branch for support patch.
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-2071 (from rev 6023, legacy/branches/jbossws-1.2.1.GA_JBWS-1900)
16 years, 3 months
JBossWS SVN: r6023 - framework/trunk/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-19 11:50:20 -0400 (Wed, 19 Mar 2008)
New Revision: 6023
Modified:
framework/trunk/hudson/jboss/bin/jboss.sh
Log:
also from help message
Modified: framework/trunk/hudson/jboss/bin/jboss.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/jboss.sh 2008-03-19 15:49:31 UTC (rev 6022)
+++ framework/trunk/hudson/jboss/bin/jboss.sh 2008-03-19 15:50:20 UTC (rev 6023)
@@ -49,5 +49,5 @@
$0 start
;;
*)
- echo "usage: $0 jboss_instance (start|stop|tcsstart|restart|tcsrestart|help)"
+ echo "usage: $0 jboss_instance (start|stop|restart|help)"
esac
16 years, 3 months
JBossWS SVN: r6022 - framework/trunk/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-19 11:49:31 -0400 (Wed, 19 Mar 2008)
New Revision: 6022
Modified:
framework/trunk/hudson/jboss/bin/jboss.sh
Log:
removing TCK related staff
Modified: framework/trunk/hudson/jboss/bin/jboss.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/jboss.sh 2008-03-19 14:50:48 UTC (rev 6021)
+++ framework/trunk/hudson/jboss/bin/jboss.sh 2008-03-19 15:49:31 UTC (rev 6022)
@@ -44,20 +44,10 @@
$JBOSS_HOME/bin/shutdown.sh -S > /dev/null &
fi
;;
-tcsstart)
- # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid
- # It relies on bash specific features
- # Do you want to hide jboss output?
- /bin/bash $DIRNAME/runjboss.sh -b $BINDADDR -c cts &
- ;;
restart)
$0 stop
$0 start
;;
-tcsrestart)
- $0 stop
- $0 tcsstart
- ;;
*)
echo "usage: $0 jboss_instance (start|stop|tcsstart|restart|tcsrestart|help)"
esac
16 years, 3 months
JBossWS SVN: r6021 - in framework/trunk/src/main/java/org/jboss/wsf/framework: management and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-03-19 10:50:48 -0400 (Wed, 19 Mar 2008)
New Revision: 6021
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java
Log:
[JBWS-1992] saving endpoint registry as a parameter of the endpoint registry deployment aspect and skipping JMX server unregister when the mbeanServer is not available
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2008-03-19 13:23:54 UTC (rev 6020)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2008-03-19 14:50:48 UTC (rev 6021)
@@ -37,10 +37,13 @@
*/
public class EndpointRegistryDeploymentAspect extends DeploymentAspect
{
+ private EndpointRegistry registry;
+
public void create(Deployment dep)
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- EndpointRegistry registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
+ if (registry == null)
+ registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
for (Endpoint ep : dep.getService().getEndpoints())
{
registry.register(ep);
@@ -50,8 +53,8 @@
public void destroy(Deployment dep)
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- EndpointRegistry registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
-
+ if (registry == null)
+ registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
for (Endpoint ep : dep.getService().getEndpoints())
{
registry.unregister(ep);
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java 2008-03-19 13:23:54 UTC (rev 6020)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java 2008-03-19 14:50:48 UTC (rev 6021)
@@ -63,7 +63,7 @@
ManagedEndpoint jmxEndpoint = new ManagedEndpoint(endpoint, mbeanServer);
getMbeanServer().registerMBean(jmxEndpoint, endpoint.getName());
}
- catch (JMException ex)
+ catch (Exception ex)
{
log.error("Cannot register endpoint with JMX server", ex);
}
@@ -75,7 +75,10 @@
super.unregister(endpoint);
try
{
- getMbeanServer().unregisterMBean(endpoint.getName());
+ if (getMbeanServer() != null)
+ getMbeanServer().unregisterMBean(endpoint.getName());
+ else
+ log.warn("MBeanServer not available, cannot unregister endpoint with JMX server");
}
catch (JMException ex)
{
16 years, 3 months
JBossWS SVN: r6020 - in framework/trunk/hudson/hudson-home/jobs: Metro-Core-AS-4.2.3 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-19 09:23:54 -0400 (Wed, 19 Mar 2008)
New Revision: 6020
Modified:
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml
Log:
Fix target container
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-03-19 13:00:25 UTC (rev 6019)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-03-19 13:23:54 UTC (rev 6020)
@@ -12,10 +12,8 @@
FRAMEWORKDIR=$WORKSPACE/framework
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-JBOSS_INSTANCE=$JBOSS500_INSTANCE
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE"
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE"
#
# stop jbossas
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-03-19 13:00:25 UTC (rev 6019)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-03-19 13:23:54 UTC (rev 6020)
@@ -13,7 +13,7 @@
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
#
@@ -92,6 +92,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-metro-(a)version.id@ against AS-4.2.2</description>
+ <description>Build and test jbossws-metro-(a)version.id@ against AS-4.2.3</description>
<actions class="vector"/>
</project>
\ No newline at end of file
16 years, 3 months
JBossWS SVN: r6019 - stack/metro/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-19 09:00:25 -0400 (Wed, 19 Mar 2008)
New Revision: 6019
Modified:
stack/metro/trunk/build.xml
Log:
clean target should not delete glassfish-metro dir
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-03-19 09:05:10 UTC (rev 6018)
+++ stack/metro/trunk/build.xml 2008-03-19 13:00:25 UTC (rev 6019)
@@ -224,8 +224,7 @@
<!-- ================================================================== -->
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="glassfish-metro"/>
- <delete dir="output"/>
+ <delete dir="${metro.output.dir}"/>
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
16 years, 3 months
JBossWS SVN: r6018 - stack/cxf/trunk/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-19 05:05:10 -0400 (Wed, 19 Mar 2008)
New Revision: 6018
Modified:
stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml
Log:
Restore WSEndpointRegistry to stack config. This needs to be properly handled for all supported containers - the released ones as well
Modified: stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml 2008-03-19 09:05:06 UTC (rev 6017)
+++ stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml 2008-03-19 09:05:10 UTC (rev 6018)
@@ -24,6 +24,11 @@
-->
</bean>
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
<!-- Logging redirector -->
<bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
<property name="namespaces">
16 years, 3 months
JBossWS SVN: r6017 - stack/metro/trunk/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-19 05:05:06 -0400 (Wed, 19 Mar 2008)
New Revision: 6017
Modified:
stack/metro/trunk/src/main/resources/jbossws-metro-config.xml
Log:
Restore WSEndpointRegistry to stack config. This needs to be properly handled for all supported containers - the released ones as well
Modified: stack/metro/trunk/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/trunk/src/main/resources/jbossws-metro-config.xml 2008-03-19 08:40:11 UTC (rev 6016)
+++ stack/metro/trunk/src/main/resources/jbossws-metro-config.xml 2008-03-19 09:05:06 UTC (rev 6017)
@@ -24,6 +24,11 @@
-->
</bean>
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
<!-- Logging redirector -->
<bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
<property name="namespaces">
16 years, 3 months
JBossWS SVN: r6016 - stack/metro/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-19 04:40:11 -0400 (Wed, 19 Mar 2008)
New Revision: 6016
Modified:
stack/metro/trunk/version.properties
Log:
Restore usage of jbossws-jboss42=4.2.1.GA
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2008-03-19 08:39:44 UTC (rev 6015)
+++ stack/metro/trunk/version.properties 2008-03-19 08:40:11 UTC (rev 6016)
@@ -17,7 +17,7 @@
jbossws-spi=snapshot
jbossws-common=snapshot
jbossws-framework=snapshot
-jbossws-jboss42=4.2.3.CR1
+jbossws-jboss42=4.2.1.GA
junit=3.8.1
jboss-common-core=2.0.2.GA
16 years, 3 months
JBossWS SVN: r6015 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-19 04:39:44 -0400 (Wed, 19 Mar 2008)
New Revision: 6015
Modified:
stack/cxf/trunk/version.properties
Log:
Restore usage of jbossws-jboss42=4.2.1.GA
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2008-03-19 08:26:13 UTC (rev 6014)
+++ stack/cxf/trunk/version.properties 2008-03-19 08:39:44 UTC (rev 6015)
@@ -35,7 +35,7 @@
jbossws-spi=1.0.1.GA
jbossws-common=snapshot
jbossws-framework=snapshot
-jbossws-jboss42=4.2.3.CR1
+jbossws-jboss42=4.2.1.GA
apache-xml-commons=1.2
ibm-wsdl4j=1.6.2
16 years, 3 months