JBossWS SVN: r4257 - in framework/branches/framework-2.0/hudson/hudson-home/jobs: AS-Tests-AS-4.0 and 12 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-08 09:40:00 -0400 (Wed, 08 Aug 2007)
New Revision: 4257
Removed:
framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/
framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/
framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/
framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/
framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/
framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/
framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/
framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/
Modified:
framework/branches/framework-2.0/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml
framework/branches/framework-2.0/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
framework/branches/framework-2.0/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
Log:
REmove metro, cxf
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/(a)hudson.jboss40.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40"
@@ -90,14 +88,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
-
-#
# build and deploy
#
cd $STACKNATIVE
@@ -103,14 +87,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
-
-#
# build and deploy
#
cd $STACKNATIVE
@@ -103,14 +87,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build(a)-ejb3
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
@@ -76,14 +74,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
-
-#
# build and deploy
#
cd $STACKNATIVE
@@ -90,14 +74,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
@@ -33,20 +31,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
-
-#
# build and deploy
#
cd $STACKNATIVE
@@ -100,14 +84,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
-
-#
# build and deploy
#
cd $STACKNATIVE
@@ -90,14 +74,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
@@ -85,14 +83,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
@@ -26,20 +24,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
-
-#
# Build distro
#
cd $STACKNATIVE
@@ -99,14 +83,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
@@ -26,20 +24,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
-
-#
# Build distro
#
cd $STACKNATIVE
@@ -99,14 +83,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build(a)-ejb3
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
@@ -76,14 +74,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
-
-#
# build and deploy
#
cd $STACKNATIVE
@@ -90,14 +74,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-08 13:28:56 UTC (rev 4256)
+++ framework/branches/framework-2.0/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-08 13:40:00 UTC (rev 4257)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
-
-#
# build and deploy
#
cd $STACKNATIVE
@@ -90,14 +74,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
17 years, 4 months
JBossWS SVN: r4256 - framework/branches/framework-2.0.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-08 09:28:56 -0400 (Wed, 08 Aug 2007)
New Revision: 4256
Modified:
framework/branches/framework-2.0/.classpath
framework/branches/framework-2.0/version.properties
Log:
version.id=2.0.1.CR1
Modified: framework/branches/framework-2.0/.classpath
===================================================================
--- framework/branches/framework-2.0/.classpath 2007-08-08 13:01:44 UTC (rev 4255)
+++ framework/branches/framework-2.0/.classpath 2007-08-08 13:28:56 UTC (rev 4256)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
<classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/>
@@ -13,7 +12,9 @@
<classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/>
<classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
+ <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/>
+ <classpathentry kind="lib" path="thirdparty/activation.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: framework/branches/framework-2.0/version.properties
===================================================================
--- framework/branches/framework-2.0/version.properties 2007-08-08 13:01:44 UTC (rev 4255)
+++ framework/branches/framework-2.0/version.properties 2007-08-08 13:28:56 UTC (rev 4256)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=1.0.0.CR1
-repository.id=1.0.0.CR1
+version.id=2.0.1.CR1
+repository.id=2.0.1.CR1
implementation.title=JBoss Web Services - Framework
implementation.url=http://www.jboss.org/products/jbossws
17 years, 4 months
JBossWS SVN: r4255 - stack/native/branches.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-08 09:01:44 -0400 (Wed, 08 Aug 2007)
New Revision: 4255
Added:
stack/native/branches/native-2.0/
Log:
create branch native-2.0
Copied: stack/native/branches/native-2.0 (from rev 4254, stack/native/trunk)
17 years, 4 months
JBossWS SVN: r4254 - framework/branches.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-08 08:59:53 -0400 (Wed, 08 Aug 2007)
New Revision: 4254
Added:
framework/branches/framework-2.0/
Log:
create framework-2.0
Copied: framework/branches/framework-2.0 (from rev 4253, framework/trunk)
17 years, 4 months
JBossWS SVN: r4253 - framework.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-08 08:59:11 -0400 (Wed, 08 Aug 2007)
New Revision: 4253
Added:
framework/branches/
Log:
create branches
17 years, 4 months
JBossWS SVN: r4252 - container/jboss42/trunk and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-08 08:49:46 -0400 (Wed, 08 Aug 2007)
New Revision: 4252
Modified:
container/jboss40/trunk/version.properties
container/jboss42/trunk/version.properties
container/jboss50/trunk/version.properties
stack/cxf/trunk/version.properties
stack/metro/trunk/version.properties
stack/native/trunk/version.properties
Log:
Use repository.id=2.0.1.CR1 for container integration
Modified: container/jboss40/trunk/version.properties
===================================================================
--- container/jboss40/trunk/version.properties 2007-08-08 12:21:03 UTC (rev 4251)
+++ container/jboss40/trunk/version.properties 2007-08-08 12:49:46 UTC (rev 4252)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.GA
-repository.id=snapshot
+version.id=2.0.1.CR1
+repository.id=2.0.1.CR1
implementation.title=JBoss Web Services - Integration JBoss40
implementation.url=http://www.jboss.org/products/jbossws
Modified: container/jboss42/trunk/version.properties
===================================================================
--- container/jboss42/trunk/version.properties 2007-08-08 12:21:03 UTC (rev 4251)
+++ container/jboss42/trunk/version.properties 2007-08-08 12:49:46 UTC (rev 4252)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.GA
-repository.id=snapshot
+version.id=2.0.1.CR1
+repository.id=2.0.1.CR1
implementation.title=JBoss Web Services - Integration JBoss42
implementation.url=http://www.jboss.org/products/jbossws
Modified: container/jboss50/trunk/version.properties
===================================================================
--- container/jboss50/trunk/version.properties 2007-08-08 12:21:03 UTC (rev 4251)
+++ container/jboss50/trunk/version.properties 2007-08-08 12:49:46 UTC (rev 4252)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.GA
-repository.id=snapshot
+version.id=2.0.1.CR1
+repository.id=2.0.1.CR1
implementation.title=JBoss Web Services - Integration JBoss50
implementation.url=http://www.jboss.org/products/jbossws
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2007-08-08 12:21:03 UTC (rev 4251)
+++ stack/cxf/trunk/version.properties 2007-08-08 12:49:46 UTC (rev 4252)
@@ -17,8 +17,8 @@
jbossws-common=1.0.0.CR1
jbossws-framework=1.0.0.CR1
jbossws-spi=1.0.0.CR1
-jbossws-jboss50=snapshot
-jbossws-jboss42=snapshot
+jbossws-jboss50=2.0.1.CR1
+jbossws-jboss42=2.0.1.CR1
apache-cxf=2.0
apache-xml-commons=1.2
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2007-08-08 12:21:03 UTC (rev 4251)
+++ stack/metro/trunk/version.properties 2007-08-08 12:49:46 UTC (rev 4252)
@@ -17,8 +17,8 @@
jbossws-common=1.0.0.CR1
jbossws-framework=1.0.0.CR1
jbossws-spi=1.0.0.CR1
-jbossws-jboss50=snapshot
-jbossws-jboss42=snapshot
+jbossws-jboss50=2.0.1.CR1
+jbossws-jboss42=2.0.1.CR1
jboss-common-core=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2007-08-08 12:21:03 UTC (rev 4251)
+++ stack/native/trunk/version.properties 2007-08-08 12:49:46 UTC (rev 4252)
@@ -28,9 +28,9 @@
jbossws-common=1.0.0.CR1
jbossws-framework=1.0.0.CR1
jbossws-spi=1.0.0.CR1
-jbossws-jboss40=snapshot
-jbossws-jboss42=snapshot
-jbossws-jboss50=snapshot
+jbossws-jboss40=2.0.1.CR1
+jbossws-jboss42=2.0.1.CR1
+jbossws-jboss50=2.0.1.CR1
# JBossAS-5.0
jboss-jbossxb-jboss50=2.0.0.CR2
17 years, 4 months
JBossWS SVN: r4251 - stack/native/branches.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-08 08:21:03 -0400 (Wed, 08 Aug 2007)
New Revision: 4251
Removed:
stack/native/branches/jbossws-2.0/
Log:
Recreate branch 2.0 with changes for Pre/Post JSE deployment
17 years, 4 months
JBossWS SVN: r4250 - container/jboss42/trunk/src/main/resources and 6 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-08 08:02:42 -0400 (Wed, 08 Aug 2007)
New Revision: 4250
Added:
framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointMetricsFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointMetricsFactory.java
Modified:
container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml
container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml
container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java
spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointMetrics.java
stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml
Log:
Add EndpointMetricsFactory
Modified: container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml
===================================================================
--- container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml 2007-08-08 11:12:46 UTC (rev 4249)
+++ container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml 2007-08-08 12:02:42 UTC (rev 4250)
@@ -151,7 +151,7 @@
</bean>
<bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
- <property name="endpointMetrics"><inject bean="WSEndpointMetrics"/></property>
+ <property name="provides">EndpointMetrics</property>
</bean>
<bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
@@ -199,7 +199,6 @@
<property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
<property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
</bean>
- <bean name="WSEndpointMetrics" class="org.jboss.wsf.framework.management.EndpointMetricsImpl"/>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss40.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss40.SecurityHandlerEJB3"/>
<bean name="WSServiceRefMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ServiceRefMetaDataAdapter"/>
@@ -219,7 +218,10 @@
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSContainerMetaDataDeploymentAspect"/>
<inject bean="WSContextRootDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
<inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSModifyWebMetaDataDeploymentAspect"/>
<inject bean="WSURLPatternDeploymentAspect"/>
</set>
@@ -232,10 +234,7 @@
<property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSEndpointAddressDeploymentAspect"/>
<inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSEndpointRegistryDeploymentAspect"/>
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
</set>
Modified: container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2007-08-08 11:12:46 UTC (rev 4249)
+++ container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2007-08-08 12:02:42 UTC (rev 4250)
@@ -163,7 +163,7 @@
</bean>
<bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
- <property name="endpointMetrics"><inject bean="WSEndpointMetrics"/></property>
+ <property name="provides">EndpointMetrics</property>
</bean>
<bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
@@ -211,7 +211,6 @@
<property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
<property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
</bean>
- <bean name="WSEndpointMetrics" class="org.jboss.wsf.framework.management.EndpointMetricsImpl"/>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/>
@@ -229,7 +228,10 @@
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSContainerMetaDataDeploymentAspect"/>
<inject bean="WSContextRootDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
<inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSModifyWebMetaDataDeploymentAspect"/>
<inject bean="WSURLPatternDeploymentAspect"/>
</set>
@@ -242,10 +244,7 @@
<property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSEndpointAddressDeploymentAspect"/>
<inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSEndpointRegistryDeploymentAspect"/>
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
</set>
Modified: container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-08 11:12:46 UTC (rev 4249)
+++ container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-08 12:02:42 UTC (rev 4250)
@@ -229,7 +229,7 @@
</bean>
<bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
- <property name="endpointMetrics"><inject bean="WSEndpointMetrics"/></property>
+ <property name="provides">EndpointMetrics</property>
</bean>
<bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
@@ -270,7 +270,6 @@
</bean>
<!-- Deployment aspect helper beans -->
- <bean name="WSEndpointMetrics" class="org.jboss.wsf.framework.management.EndpointMetricsImpl"/>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB3"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss50.DefaultWebAppDesciptorModifierImpl"/>
@@ -288,7 +287,10 @@
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSContainerMetaDataDeploymentAspect"/>
<inject bean="WSContextRootDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
<inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSModifyWebMetaDataDeploymentAspect"/>
<inject bean="WSURLPatternDeploymentAspect"/>
</set>
@@ -301,10 +303,7 @@
<property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSEndpointAddressDeploymentAspect"/>
<inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSEndpointRegistryDeploymentAspect"/>
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
</set>
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-08-08 11:12:46 UTC (rev 4249)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-08-08 12:02:42 UTC (rev 4250)
@@ -28,6 +28,7 @@
import org.jboss.wsf.framework.http.DefaultHttpContextFactory;
import org.jboss.wsf.framework.http.DefaultHttpServerFactory;
import org.jboss.wsf.framework.invocation.DefaultResourceInjectorFactory;
+import org.jboss.wsf.framework.management.DefaultEndpointMetricsFactory;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandlerFactory;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefMetaDataParserFactory;
import org.jboss.wsf.spi.SPIProvider;
@@ -43,6 +44,7 @@
import org.jboss.wsf.spi.invocation.ResourceInjectorFactory;
import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
+import org.jboss.wsf.spi.management.EndpointMetricsFactory;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParserFactory;
@@ -87,6 +89,10 @@
{
returnType = (T)loadService(spiType, DefaultDeploymentModelFactory.class.getName());
}
+ else if (EndpointMetricsFactory.class.equals(spiType))
+ {
+ returnType = (T)loadService(spiType, DefaultEndpointMetricsFactory.class.getName());
+ }
else if (HttpContextFactory.class.equals(spiType))
{
returnType = (T)loadService(spiType, DefaultHttpContextFactory.class.getName());
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java 2007-08-08 11:12:46 UTC (rev 4249)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java 2007-08-08 12:02:42 UTC (rev 4250)
@@ -23,7 +23,10 @@
//$Id$
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.management.EndpointMetrics;
+import org.jboss.wsf.spi.management.EndpointMetricsFactory;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -36,18 +39,14 @@
*/
public class EndpointMetricsDeploymentAspect extends DeploymentAspect
{
- private EndpointMetrics metrics;
-
- public void setEndpointMetrics(EndpointMetrics metrics)
- {
- this.metrics = metrics;
- }
-
@Override
public void create(Deployment dep)
{
+ SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
+ EndpointMetricsFactory factory = provider.getSPI(EndpointMetricsFactory.class);
for (Endpoint ep : dep.getService().getEndpoints())
{
+ EndpointMetrics metrics = factory.newEndpointMetrics();
ep.setEndpointMetrics(metrics);
}
}
Added: framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointMetricsFactory.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointMetricsFactory.java (rev 0)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointMetricsFactory.java 2007-08-08 12:02:42 UTC (rev 4250)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.management;
+
+// $Id: EndpointMetricsImpl.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $
+
+import org.jboss.wsf.spi.management.EndpointMetrics;
+import org.jboss.wsf.spi.management.EndpointMetricsFactory;
+
+/**
+ * Endpoint Metrics factory
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-Aug-2007
+ */
+public class DefaultEndpointMetricsFactory extends EndpointMetricsFactory
+{
+ @Override
+ public EndpointMetrics newEndpointMetrics()
+ {
+ return new EndpointMetricsImpl();
+ }
+}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointMetrics.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointMetrics.java 2007-08-08 11:12:46 UTC (rev 4249)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointMetrics.java 2007-08-08 12:02:42 UTC (rev 4250)
@@ -1,5 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.wsf.spi.management;
+//$Id: EndpointMetricsDeploymentAspect.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $
+
import java.util.Date;
import org.jboss.wsf.spi.deployment.Endpoint;
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointMetricsFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointMetricsFactory.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointMetricsFactory.java 2007-08-08 12:02:42 UTC (rev 4250)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.management;
+
+//$Id: EndpointMetricsDeploymentAspect.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $
+
+public abstract class EndpointMetricsFactory
+{
+ public abstract EndpointMetrics newEndpointMetrics();
+}
\ No newline at end of file
Modified: stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml
===================================================================
--- stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml 2007-08-08 11:12:46 UTC (rev 4249)
+++ stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml 2007-08-08 12:02:42 UTC (rev 4250)
@@ -41,11 +41,6 @@
</property>
</bean>
- <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler</property>
- <property name="provides">StackEndpointHandler</property>
- </bean>
-
<bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.xfire.DescriptorDeploymentAspect">
<property name="requires">EndpointAddress</property>
<property name="provides">StackDescriptor</property>
@@ -53,6 +48,11 @@
<property name="invokerJSE">org.jboss.wsf.stack.xfire.InvokerJSE</property>
</bean>
+ <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerEndpointHandler</property>
+ <property name="provides">StackEndpointHandler</property>
+ </bean>
+
<!-- Deployment aspect installers -->
<!-- Phase 2 -->
17 years, 4 months
JBossWS SVN: r4249 - legacy/branches/dlofthouse.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-08 07:12:46 -0400 (Wed, 08 Aug 2007)
New Revision: 4249
Added:
legacy/branches/dlofthouse/JBWS-1763/
Log:
Recreate
Copied: legacy/branches/dlofthouse/JBWS-1763 (from rev 4248, legacy/branches/jbossws-2.0)
17 years, 4 months
JBossWS SVN: r4248 - legacy/branches/dlofthouse.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-08 07:12:17 -0400 (Wed, 08 Aug 2007)
New Revision: 4248
Removed:
legacy/branches/dlofthouse/JBWS-1763/
Log:
Recreate
17 years, 4 months