JBossWS SVN: r5794 - in framework/trunk/hudson/hudson-home/jobs: AS-Tests-AS-4.2.3 and 38 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-25 07:08:24 -0500 (Mon, 25 Feb 2008)
New Revision: 5794
Modified:
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml
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.1/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml
Log:
[JBWS-1982] Simplify deploy/undeploy cycles for different stacks
deploy/undeploy based on filelist
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.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-jboss422
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
# 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/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.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"
@@ -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-jboss423
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
# 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/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.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"
@@ -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-jboss500
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
# 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/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.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-jboss501
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
# build and deploy
#
cd $STACKNATIVE
@@ -105,14 +89,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/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -10,8 +10,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.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
# Build distro
#
cd $STACKCXF
@@ -93,14 +77,6 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -10,8 +10,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.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
# Build distro
#
cd $STACKCXF
@@ -93,14 +77,6 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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>
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-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -10,8 +10,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
-STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
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@
@@ -25,20 +23,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
# Build distro
#
cd $STACKCXF
@@ -95,14 +79,6 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -10,8 +10,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.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
# Build distro
#
cd $STACKCXF
@@ -93,14 +77,6 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -10,8 +10,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.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
# build and deploy
#
cd $STACKCXF
@@ -87,14 +71,6 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -10,8 +10,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.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
# build and deploy
#
cd $STACKCXF
@@ -87,14 +71,6 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -10,8 +10,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.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
# build and deploy
#
cd $STACKCXF
@@ -87,14 +71,6 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -10,8 +10,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.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
# build and deploy
#
cd $STACKCXF
@@ -87,14 +71,6 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -11,9 +11,7 @@
WORKSPACE=`pwd`
CVS_USER=`whoami`
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.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
@@ -24,20 +22,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
# build and deploy
#
cd $STACKMETRO
@@ -88,17 +72,9 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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/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-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -11,9 +11,7 @@
WORKSPACE=`pwd`
CVS_USER=`whoami`
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.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
@@ -24,20 +22,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
# build and deploy
#
cd $STACKMETRO
@@ -88,17 +72,9 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -11,9 +11,7 @@
WORKSPACE=`pwd`
CVS_USER=`whoami`
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.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 -Dcvs.user=$CVS_USER"
@@ -24,20 +22,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
# build and deploy
#
cd $STACKMETRO
@@ -88,17 +72,9 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -11,9 +11,7 @@
WORKSPACE=`pwd`
CVS_USER=`whoami`
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.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
@@ -24,20 +22,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
# build and deploy
#
cd $STACKMETRO
@@ -88,17 +72,9 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -11,9 +11,7 @@
WORKSPACE=`pwd`
CVS_USER=`whoami`
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.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
@@ -24,20 +22,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
# Build distro
#
cd $STACKMETRO
@@ -94,17 +78,9 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -11,9 +11,7 @@
WORKSPACE=`pwd`
CVS_USER=`whoami`
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.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"
@@ -24,20 +22,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
# Build distro
#
cd $STACKMETRO
@@ -94,17 +78,9 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -11,9 +11,7 @@
WORKSPACE=`pwd`
CVS_USER=`whoami`
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.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 -Dcvs.user=$CVS_USER"
@@ -24,20 +22,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
# Build distro
#
cd $STACKMETRO
@@ -94,17 +78,9 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -11,9 +11,7 @@
WORKSPACE=`pwd`
CVS_USER=`whoami`
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.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
@@ -24,20 +22,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
# Build distro
#
cd $STACKMETRO
@@ -94,17 +78,9 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -11,9 +11,7 @@
WORKSPACE=`pwd`
CVS_USER=`whoami`
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.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
@@ -24,20 +22,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
# build and deploy
#
cd $STACKMETRO
@@ -88,17 +72,9 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -11,9 +11,7 @@
WORKSPACE=`pwd`
CVS_USER=`whoami`
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.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"
@@ -24,20 +22,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
# build and deploy
#
cd $STACKMETRO
@@ -88,17 +72,9 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -11,9 +11,7 @@
WORKSPACE=`pwd`
CVS_USER=`whoami`
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.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 -Dcvs.user=$CVS_USER"
@@ -24,20 +22,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
# build and deploy
#
cd $STACKMETRO
@@ -88,17 +72,9 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -11,9 +11,7 @@
WORKSPACE=`pwd`
CVS_USER=`whoami`
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.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
@@ -24,20 +22,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-native
-#
-cd $STACKNATIVE
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
# build and deploy
#
cd $STACKMETRO
@@ -88,17 +72,9 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <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/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.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-jboss422
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
# 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/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.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-jboss422
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
# 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/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.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"
@@ -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-jboss423
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
# 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/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.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"
@@ -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-jboss423
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
# 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/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.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"
@@ -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-jboss500
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
# 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/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.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-jboss501
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
# 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/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.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-jboss422
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
# Build distro
#
cd $STACKNATIVE
@@ -96,14 +80,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/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.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-jboss422
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
# Build distro
#
cd $STACKNATIVE
@@ -106,14 +90,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/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.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"
@@ -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-jboss423
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
# Build distro
#
cd $STACKNATIVE
@@ -96,14 +80,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/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.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"
@@ -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-jboss423
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
# Build distro
#
cd $STACKNATIVE
@@ -106,14 +90,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/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.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"
@@ -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-jboss500
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
# Build distro
#
cd $STACKNATIVE
@@ -96,14 +80,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/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.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-jboss501
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
# Build distro
#
cd $STACKNATIVE
@@ -96,14 +80,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/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.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-jboss422
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
-
-#
# 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/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.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"
@@ -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-jboss423
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss423
-
-#
# 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/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.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"
@@ -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-jboss500
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
-
-#
# 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/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml 2008-02-25 11:51:32 UTC (rev 5793)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml 2008-02-25 12:08:24 UTC (rev 5794)
@@ -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.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.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-jboss501
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss501
-
-#
# 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">
16 years, 10 months
JBossWS SVN: r5793 - in stack/metro/trunk: ant-import and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-25 06:51:32 -0500 (Mon, 25 Feb 2008)
New Revision: 5793
Modified:
stack/metro/trunk/
stack/metro/trunk/ant-import/macros-deploy-metro.xml
stack/metro/trunk/build.xml
Log:
[JBWS-1982] Simplify deploy/undeploy cycles for different stacks
deploy/undeploy based on filelist
Property changes on: stack/metro/trunk
___________________________________________________________________
Name: svn:ignore
- output
version.properties.md5
thirdparty
ant.properties
glassfish-metro
+ output
version.properties.md5
thirdparty
ant.properties
glassfish-metro
cvs
thirdparty-gen
checkout_id-*
Modified: stack/metro/trunk/ant-import/macros-deploy-metro.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-25 11:49:44 UTC (rev 5792)
+++ stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-25 11:51:32 UTC (rev 5793)
@@ -13,6 +13,11 @@
<project>
+ <!--
+ TODO: This assumes that the same set of files is deployed to all containers,
+ in which case it would be suffient to have a single deploy/undeploy macro def.
+ -->
+
<patternset id="client.stack.patternset">
<include name="jbossws-metro-client.jar"/>
</patternset>
@@ -51,7 +56,11 @@
<attribute name="thirdpartylibs"/>
<sequential>
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <copy todir="${jboss422.home}/client" overwrite="true">
+
+ <delete dir="${metro.output.deploy.dir}"/>
+
+ <mkdir dir="${metro.output.deploy.dir}/client"/>
+ <copy todir="${metro.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<patternset refid="client.stack.patternset"/>
</fileset>
@@ -59,36 +68,42 @@
<patternset refid="client.patternset"/>
</fileset>
</copy>
- <copy todir="${jboss422.home}/lib" overwrite="true">
+
+ <mkdir dir="${metro.output.deploy.dir}/lib"/>
+ <copy todir="${metro.output.deploy.dir}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<patternset refid="lib.patternset"/>
</fileset>
</copy>
- <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/>
- <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar" src="@{stacklibs}/jbossws-metro42.sar"/>
- <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/>
+ <unjar dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-metro.sar" src="@{stacklibs}/jbossws-metro42.sar"/>
+ <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <fileset id="jbossws.deploy.files" dir="${metro.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/>
+ <copy todir="${jboss422.home}" overwrite="true">
+ <fileset refid="jbossws.deploy.files"/>
+ </copy>
+
+ <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
+ <echo file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/>
+ <replace file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/>
+ <copy todir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/>
+
</sequential>
</macrodef>
<!-- Remove jbossws/metro from jboss422 -->
<macrodef name="macro-undeploy-metro422">
<sequential>
+
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss422.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- </fileset>
-
- <!-- BOOTSTRAP JARS -->
- <fileset dir="${jboss422.home}/lib">
- <patternset refid="lib.patternset"/>
- </fileset>
+ <fileset dir="${jboss422.home}" includes="${jbossws.undeploy.files}"/>
</delete>
-
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/>
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+
</sequential>
</macrodef>
@@ -101,7 +116,11 @@
<attribute name="thirdpartylibs"/>
<sequential>
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <copy todir="${jboss423.home}/client" overwrite="true">
+
+ <delete dir="${metro.output.deploy.dir}"/>
+
+ <mkdir dir="${metro.output.deploy.dir}/client"/>
+ <copy todir="${metro.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<patternset refid="client.stack.patternset"/>
</fileset>
@@ -109,36 +128,42 @@
<patternset refid="client.patternset"/>
</fileset>
</copy>
- <copy todir="${jboss423.home}/lib" overwrite="true">
+
+ <mkdir dir="${metro.output.deploy.dir}/lib"/>
+ <copy todir="${metro.output.deploy.dir}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<patternset refid="lib.patternset"/>
</fileset>
</copy>
- <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/>
- <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar" src="@{stacklibs}/jbossws-metro42.sar"/>
- <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/>
+ <unjar dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-metro.sar" src="@{stacklibs}/jbossws-metro42.sar"/>
+ <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <fileset id="jbossws.deploy.files" dir="${metro.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/>
+ <copy todir="${jboss423.home}" overwrite="true">
+ <fileset refid="jbossws.deploy.files"/>
+ </copy>
+
+ <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
+ <echo file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/>
+ <replace file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/>
+ <copy todir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/>
+
</sequential>
</macrodef>
<!-- Remove jbossws/metro from jboss423 -->
<macrodef name="macro-undeploy-metro423">
<sequential>
+
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss423.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- </fileset>
-
- <!-- BOOTSTRAP JARS -->
- <fileset dir="${jboss423.home}/lib">
- <patternset refid="lib.patternset"/>
- </fileset>
+ <fileset dir="${jboss423.home}" includes="${jbossws.undeploy.files}"/>
</delete>
-
- <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/>
- <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+
</sequential>
</macrodef>
@@ -152,8 +177,11 @@
<sequential>
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <delete dir="${metro.output.deploy.dir}"/>
+
<!-- CLIENT JARS -->
- <copy todir="${jboss500.home}/client" overwrite="true">
+ <mkdir dir="${metro.output.deploy.dir}/client"/>
+ <copy todir="${metro.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<patternset refid="client.stack.patternset"/>
</fileset>
@@ -163,49 +191,49 @@
</copy>
<!-- BOOTSTRAP JARS -->
- <copy todir="${jboss500.home}/lib" overwrite="true">
+ <mkdir dir="${metro.output.deploy.dir}/lib"/>
+ <copy todir="${metro.output.deploy.dir}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<patternset refid="lib.patternset"/>
</fileset>
</copy>
<!--SERVER JARS -->
- <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/lib"/>
+ <copy todir="${metro.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<patternset refid="serverlib.patternset"/>
</fileset>
</copy>
- <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/>
- <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar" src="@{stacklibs}/jbossws-metro50.sar"/>
- <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/>
+ <unjar dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-metro.sar" src="@{stacklibs}/jbossws-metro50.sar"/>
+ <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <fileset id="jbossws.deploy.files" dir="${metro.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/>
+ <copy todir="${jboss500.home}" overwrite="true">
+ <fileset refid="jbossws.deploy.files"/>
+ </copy>
+
+ <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
+ <echo file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/>
+ <replace file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/>
+ <copy todir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/>
+
</sequential>
</macrodef>
<!-- Remove jbossws/metro from jboss500 -->
<macrodef name="macro-undeploy-metro500">
<sequential>
+
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss500.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- </fileset>
-
- <!-- BOOTSTRAP JARS -->
- <fileset dir="${jboss500.home}/lib">
- <patternset refid="lib.patternset"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib">
- <patternset refid="serverlib.patternset"/>
- </fileset>
+ <fileset dir="${jboss500.home}" includes="${jbossws.undeploy.files}"/>
</delete>
-
- <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/>
- <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+
</sequential>
</macrodef>
@@ -219,8 +247,11 @@
<sequential>
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <delete dir="${metro.output.deploy.dir}"/>
+
<!-- CLIENT JARS -->
- <copy todir="${jboss501.home}/client" overwrite="true">
+ <mkdir dir="${metro.output.deploy.dir}/client"/>
+ <copy todir="${metro.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<patternset refid="client.stack.patternset"/>
</fileset>
@@ -230,49 +261,49 @@
</copy>
<!-- BOOTSTRAP JARS -->
- <copy todir="${jboss501.home}/lib" overwrite="true">
+ <mkdir dir="${metro.output.deploy.dir}/lib"/>
+ <copy todir="${metro.output.deploy.dir}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<patternset refid="lib.patternset"/>
</fileset>
</copy>
<!--SERVER JARS -->
- <copy todir="${jboss501.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/lib"/>
+ <copy todir="${metro.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<patternset refid="serverlib.patternset"/>
</fileset>
</copy>
- <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/>
- <unjar dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar" src="@{stacklibs}/jbossws-metro50.sar"/>
- <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/>
+ <unjar dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-metro.sar" src="@{stacklibs}/jbossws-metro50.sar"/>
+ <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <fileset id="jbossws.deploy.files" dir="${metro.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/>
+ <copy todir="${jboss501.home}" overwrite="true">
+ <fileset refid="jbossws.deploy.files"/>
+ </copy>
+
+ <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
+ <echo file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/>
+ <replace file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/>
+ <copy todir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/>
+
</sequential>
</macrodef>
<!-- Remove jbossws/metro from jboss501 -->
<macrodef name="macro-undeploy-metro501">
<sequential>
+
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss501.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- </fileset>
-
- <!-- BOOTSTRAP JARS -->
- <fileset dir="${jboss501.home}/lib">
- <patternset refid="lib.patternset"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss501.home}/server/${jboss.server.instance}/lib">
- <patternset refid="serverlib.patternset"/>
- </fileset>
+ <fileset dir="${jboss501.home}" includes="${jbossws.undeploy.files}"/>
</delete>
-
- <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/>
- <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+
</sequential>
</macrodef>
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-02-25 11:49:44 UTC (rev 5792)
+++ stack/metro/trunk/build.xml 2008-02-25 11:51:32 UTC (rev 5793)
@@ -34,6 +34,7 @@
<property name="metro.output.dir" value="${metro.dir}/output"/>
<property name="metro.output.apidocs.dir" value="${metro.output.dir}/apidocs"/>
<property name="metro.output.classes.dir" value="${metro.output.dir}/classes"/>
+ <property name="metro.output.deploy.dir" value="${metro.output.dir}/deploy"/>
<property name="metro.output.etc.dir" value="${metro.output.dir}/etc"/>
<property name="metro.output.lib.dir" value="${metro.output.dir}/lib"/>
16 years, 10 months
JBossWS SVN: r5792 - in stack/cxf/trunk: ant-import and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-25 06:49:44 -0500 (Mon, 25 Feb 2008)
New Revision: 5792
Modified:
stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
stack/cxf/trunk/build.xml
Log:
[JBWS-1982] Simplify deploy/undeploy cycles for different stacks
deploy/undeploy based on filelist
Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
===================================================================
--- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-25 11:08:37 UTC (rev 5791)
+++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-25 11:49:44 UTC (rev 5792)
@@ -12,20 +12,23 @@
<!-- $Id$ -->
<project>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss-4.2.2 -->
<!-- ================================================================== -->
<!-- Deploy jbossws/cxf to jboss422 -->
<macrodef name="macro-deploy-cxf422">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
<sequential>
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss422.home}/client" overwrite="true">
+
+ <delete dir="${cxf.output.deploy.dir}"/>
+
+ <!-- CLIENT JARS -->
+ <mkdir dir="${cxf.output.deploy.dir}/client"/>
+ <copy todir="${cxf.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -33,34 +36,44 @@
</fileset>
</copy>
- <!-- BOOTSTRAP JARS -->
- <copy todir="${jboss422.home}/lib" overwrite="true">
+ <!-- BOOTSTRAP JARS -->
+ <mkdir dir="${cxf.output.deploy.dir}/lib"/>
+ <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
</fileset>
</copy>
-
- <!--SERVER JARS -->
- <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
- <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf42.sar"/>
- <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <!--SERVER JARS -->
+ <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf42.sar"/>
+ <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/>
+ <copy todir="${jboss422.home}" overwrite="true">
+ <fileset refid="jbossws.deploy.files"/>
+ </copy>
+
+ <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
+ <echo file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/>
+ <replace file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/>
+ <copy todir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/>
+
</sequential>
</macrodef>
-
+
<!-- Undeploy jbossws/cxf from jboss422 -->
<macrodef name="macro-undeploy-cxf422">
<sequential>
+
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss422.home}/client">
- <include name="jbossws-spi.jar"/>
- </fileset>
+ <fileset dir="${jboss422.home}" includes="${jbossws.undeploy.files}"/>
</delete>
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -70,13 +83,16 @@
<!-- Deploy jbossws/cxf to jboss423 -->
<macrodef name="macro-deploy-cxf423">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
<sequential>
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss423.home}/client" overwrite="true">
+
+ <delete dir="${cxf.output.deploy.dir}"/>
+
+ <!-- CLIENT JARS -->
+ <mkdir dir="${cxf.output.deploy.dir}/client"/>
+ <copy todir="${cxf.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -84,34 +100,44 @@
</fileset>
</copy>
- <!-- BOOTSTRAP JARS -->
- <copy todir="${jboss423.home}/lib" overwrite="true">
+ <!-- BOOTSTRAP JARS -->
+ <mkdir dir="${cxf.output.deploy.dir}/lib"/>
+ <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
</fileset>
</copy>
-
- <!--SERVER JARS -->
- <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
- <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf42.sar"/>
- <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <!--SERVER JARS -->
+ <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf42.sar"/>
+ <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/>
+ <copy todir="${jboss423.home}" overwrite="true">
+ <fileset refid="jbossws.deploy.files"/>
+ </copy>
+
+ <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
+ <echo file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/>
+ <replace file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/>
+ <copy todir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/>
+
</sequential>
</macrodef>
-
+
<!-- Undeploy jbossws/cxf from jboss423 -->
<macrodef name="macro-undeploy-cxf423">
<sequential>
+
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss423.home}/client">
- <include name="jbossws-spi.jar"/>
- </fileset>
+ <fileset dir="${jboss423.home}" includes="${jbossws.undeploy.files}"/>
</delete>
- <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
- <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -121,13 +147,16 @@
<!-- Deploy jbossws/cxf to jboss500 -->
<macrodef name="macro-deploy-cxf500">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
<sequential>
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss500.home}/client" overwrite="true">
+
+ <delete dir="${cxf.output.deploy.dir}"/>
+
+ <!-- CLIENT JARS -->
+ <mkdir dir="${cxf.output.deploy.dir}/client"/>
+ <copy todir="${cxf.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -135,55 +164,52 @@
</fileset>
</copy>
- <!-- BOOTSTRAP JARS -->
- <copy todir="${jboss500.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
-
- <!--SERVER JARS -->
- <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <!-- BOOTSTRAP JARS -->
+ <mkdir dir="${cxf.output.deploy.dir}/lib"/>
+ <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+
+ <!--SERVER JARS -->
+ <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib"/>
+ <copy todir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
<include name="jaxws-api-${cxf.jaxws.api}.jar"/>
<include name="saaj-api-${cxf.saaj}.jar"/>
- </fileset>
+ </fileset>
</copy>
- <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
- <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf50.sar"/>
- <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf50.sar"/>
+ <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/>
+ <copy todir="${jboss500.home}" overwrite="true">
+ <fileset refid="jbossws.deploy.files"/>
+ </copy>
+
+ <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
+ <echo file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/>
+ <replace file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/>
+ <copy todir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/>
+
</sequential>
</macrodef>
-
+
<!-- Undeploy jbossws/cxf from jboss500 -->
<macrodef name="macro-undeploy-cxf500">
<sequential>
+
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss500.home}/client">
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-spi.jar"/>
- </fileset>
-
- <!-- BOOTSTRAP JARS -->
- <fileset dir="${jboss500.home}/lib">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
-
- <!--SERVER JARS -->
- <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib">
- <include name="jaxws-api-${cxf.jaxws.api}.jar"/>
- <include name="saaj-api-${cxf.saaj}.jar"/>
- </fileset>
+ <fileset dir="${jboss500.home}" includes="${jbossws.undeploy.files}"/>
</delete>
- <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
- <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -193,13 +219,16 @@
<!-- Deploy jbossws/cxf to jboss501 -->
<macrodef name="macro-deploy-cxf501">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
<sequential>
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss501.home}/client" overwrite="true">
+
+ <delete dir="${cxf.output.deploy.dir}"/>
+
+ <!-- CLIENT JARS -->
+ <mkdir dir="${cxf.output.deploy.dir}/client"/>
+ <copy todir="${cxf.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -207,56 +236,53 @@
</fileset>
</copy>
- <!-- BOOTSTRAP JARS -->
- <copy todir="${jboss501.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
-
- <!--SERVER JARS -->
- <copy todir="${jboss501.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <!-- BOOTSTRAP JARS -->
+ <mkdir dir="${cxf.output.deploy.dir}/lib"/>
+ <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+
+ <!--SERVER JARS -->
+ <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib"/>
+ <copy todir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
<include name="jaxws-api-${cxf.jaxws.api}.jar"/>
<include name="saaj-api-${cxf.saaj}.jar"/>
- </fileset>
+ </fileset>
</copy>
- <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
- <unjar dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf50.sar"/>
- <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf50.sar"/>
+ <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/>
+ <copy todir="${jboss501.home}" overwrite="true">
+ <fileset refid="jbossws.deploy.files"/>
+ </copy>
+
+ <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
+ <echo file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/>
+ <replace file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/>
+ <copy todir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/>
+
</sequential>
</macrodef>
-
+
<!-- Undeploy jbossws/cxf from jboss501 -->
<macrodef name="macro-undeploy-cxf501">
<sequential>
+
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss501.home}/client">
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-spi.jar"/>
- </fileset>
-
- <!-- BOOTSTRAP JARS -->
- <fileset dir="${jboss501.home}/lib">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
-
- <!--SERVER JARS -->
- <fileset dir="${jboss501.home}/server/${jboss.server.instance}/lib">
- <include name="jaxws-api-${cxf.jaxws.api}.jar"/>
- <include name="saaj-api-${cxf.saaj}.jar"/>
- </fileset>
+ <fileset dir="${jboss501.home}" includes="${jbossws.undeploy.files}"/>
</delete>
- <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
- <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
-</project>
+</project>
\ No newline at end of file
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2008-02-25 11:08:37 UTC (rev 5791)
+++ stack/cxf/trunk/build.xml 2008-02-25 11:49:44 UTC (rev 5792)
@@ -35,6 +35,7 @@
<property name="cxf.output.dir" value="${cxf.dir}/output"/>
<property name="cxf.output.apidocs.dir" value="${cxf.output.dir}/apidocs"/>
<property name="cxf.output.classes.dir" value="${cxf.output.dir}/classes"/>
+ <property name="cxf.output.deploy.dir" value="${cxf.output.dir}/deploy"/>
<property name="cxf.output.etc.dir" value="${cxf.output.dir}/etc"/>
<property name="cxf.output.lib.dir" value="${cxf.output.dir}/lib"/>
16 years, 10 months
JBossWS SVN: r5791 - in stack/native/trunk: ant-import and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-25 06:08:37 -0500 (Mon, 25 Feb 2008)
New Revision: 5791
Modified:
stack/native/trunk/ant-import/macros-deploy-native.xml
stack/native/trunk/build.xml
Log:
[JBWS-1982] Simplify deploy/undeploy cycles for different stacks
deploy/undeploy based on filelist
Modified: stack/native/trunk/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-25 11:02:26 UTC (rev 5790)
+++ stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-25 11:08:37 UTC (rev 5791)
@@ -63,12 +63,16 @@
<sequential>
<fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
+ <delete dir="${core.output.deploy.dir}"/>
+
<!-- BIN SCRIPTS -->
- <unzip dest="${jboss421.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/>
+ <mkdir dir="${core.output.deploy.dir}/bin"/>
+ <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/>
<!-- CLIENT JARS -->
- <copy todir="${jboss421.home}/client" overwrite="true">
+ <mkdir dir="${core.output.deploy.dir}/client"/>
+ <copy todir="${core.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -91,78 +95,50 @@
</fileset>
</copy>
- <!-- SERVER JARS -->
- <copy todir="${jboss421.home}/lib" overwrite="true">
+ <!-- LIB JARS -->
+ <mkdir dir="${core.output.deploy.dir}/lib"/>
+ <copy todir="${core.output.deploy.dir}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jboss-xml-binding.jar"/>
</fileset>
</copy>
- <copy todir="${jboss421.home}/server/${jboss.server.instance}/lib" overwrite="true">
+
+ <!-- SERVER JARS -->
+ <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib"/>
+ <copy todir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jbossws-jboss421.jar"/>
</fileset>
</copy>
- <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
- <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
+ <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <fileset id="jbossws.deploy.files" dir="${core.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/>
+ <copy todir="${jboss421.home}" overwrite="true">
+ <fileset refid="jbossws.deploy.files"/>
+ </copy>
+
+ <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
+ <echo file="${core.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/>
+ <replace file="${core.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/>
+ <copy todir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${core.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/>
+
</sequential>
</macrodef>
<macrodef name="macro-undeploy-native421">
<sequential>
<fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
- <delete>
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss421.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss421.home}/client">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jbossws-jboss421.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss421.home}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- </fileset>
- <fileset dir="${jboss421.home}/lib">
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
- </fileset>
- <fileset dir="${jboss421.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-jboss421.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
- </fileset>
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
+ <delete>
+ <fileset dir="${jboss421.home}" includes="${jbossws.undeploy.files}"/>
</delete>
- <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+
</sequential>
</macrodef>
@@ -175,12 +151,16 @@
<attribute name="thirdpartylibs"/>
<sequential>
+ <delete dir="${core.output.deploy.dir}"/>
+
<!-- BIN SCRIPTS -->
- <unzip dest="${jboss422.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
+ <mkdir dir="${core.output.deploy.dir}/bin"/>
+ <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/>
<!-- CLIENT JARS -->
- <copy todir="${jboss422.home}/client" overwrite="true">
+ <mkdir dir="${core.output.deploy.dir}/client"/>
+ <copy todir="${core.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -202,65 +182,33 @@
</copy>
<!-- SERVER JARS -->
- <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
- <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
+ <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <fileset id="jbossws.deploy.files" dir="${core.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/>
+ <copy todir="${jboss422.home}" overwrite="true">
+ <fileset refid="jbossws.deploy.files"/>
+ </copy>
+
+ <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
+ <echo file="${core.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/>
+ <replace file="${core.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/>
+ <copy todir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${core.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/>
+
</sequential>
</macrodef>
<macrodef name="macro-undeploy-native422">
<sequential>
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss422.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss422.home}/client">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss422.home}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- </fileset>
- <fileset dir="${jboss422.home}/lib">
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
- </fileset>
- <fileset dir="${jboss422.home}/server/${jboss.server.instance}/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
- </fileset>
+ <fileset dir="${jboss422.home}" includes="${jbossws.undeploy.files}"/>
</delete>
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+
</sequential>
</macrodef>
@@ -273,12 +221,16 @@
<attribute name="thirdpartylibs"/>
<sequential>
+ <delete dir="${core.output.deploy.dir}"/>
+
<!-- BIN SCRIPTS -->
- <unzip dest="${jboss423.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
+ <mkdir dir="${core.output.deploy.dir}/bin"/>
+ <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/>
<!-- CLIENT JARS -->
- <copy todir="${jboss423.home}/client" overwrite="true">
+ <mkdir dir="${core.output.deploy.dir}/client"/>
+ <copy todir="${core.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -300,65 +252,33 @@
</copy>
<!-- SERVER JARS -->
- <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
- <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
+ <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <fileset id="jbossws.deploy.files" dir="${core.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/>
+ <copy todir="${jboss423.home}" overwrite="true">
+ <fileset refid="jbossws.deploy.files"/>
+ </copy>
+
+ <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
+ <echo file="${core.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/>
+ <replace file="${core.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/>
+ <copy todir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${core.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/>
+
</sequential>
</macrodef>
<macrodef name="macro-undeploy-native423">
<sequential>
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss423.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss423.home}/client">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss423.home}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- </fileset>
- <fileset dir="${jboss423.home}/lib">
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
- </fileset>
- <fileset dir="${jboss423.home}/server/${jboss.server.instance}/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
- </fileset>
+ <fileset dir="${jboss423.home}" includes="${jbossws.undeploy.files}"/>
</delete>
- <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+
</sequential>
</macrodef>
@@ -372,12 +292,16 @@
<sequential>
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <delete dir="${core.output.deploy.dir}"/>
+
<!-- BIN SCRIPTS -->
- <unzip dest="${jboss500.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
+ <mkdir dir="${core.output.deploy.dir}/bin"/>
+ <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/>
<!-- CLIENT JARS -->
- <copy todir="${jboss500.home}/client" overwrite="true">
+ <mkdir dir="${core.output.deploy.dir}/client"/>
+ <copy todir="${core.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -397,7 +321,10 @@
<include name="wsdl4j.jar"/>
</fileset>
</copy>
- <copy todir="${jboss500.home}/lib" overwrite="true">
+
+ <!-- LIB JARS -->
+ <mkdir dir="${core.output.deploy.dir}/lib"/>
+ <copy todir="${core.output.deploy.dir}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -405,7 +332,7 @@
</copy>
<!-- SERVER JARS -->
- <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <copy todir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{stacklibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -414,10 +341,10 @@
</fileset>
</copy>
- <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
- <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
+ <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -425,44 +352,12 @@
<sequential>
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete>
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss500.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss500.home}/client">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
+ <fileset dir="${jboss500.home}" includes="${jbossws.undeploy.files}"/>
</delete>
- <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -470,18 +365,23 @@
<!-- Deployment JBoss-5.0.1 -->
<!-- ================================================================== -->
+
<macrodef name="macro-deploy-native501">
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
<sequential>
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <delete dir="${core.output.deploy.dir}"/>
+
<!-- BIN SCRIPTS -->
- <unzip dest="${jboss501.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
+ <mkdir dir="${core.output.deploy.dir}/bin"/>
+ <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/>
<!-- CLIENT JARS -->
- <copy todir="${jboss501.home}/client" overwrite="true">
+ <mkdir dir="${core.output.deploy.dir}/client"/>
+ <copy todir="${core.output.deploy.dir}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -501,7 +401,10 @@
<include name="wsdl4j.jar"/>
</fileset>
</copy>
- <copy todir="${jboss501.home}/lib" overwrite="true">
+
+ <!-- LIB JARS -->
+ <mkdir dir="${core.output.deploy.dir}/lib"/>
+ <copy todir="${core.output.deploy.dir}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -509,7 +412,8 @@
</copy>
<!-- SERVER JARS -->
- <copy todir="${jboss501.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib"/>
+ <copy todir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{stacklibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -518,10 +422,21 @@
</fileset>
</copy>
- <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
- <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
+ <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+
+ <fileset id="jbossws.deploy.files" dir="${core.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/>
+ <copy todir="${jboss501.home}" overwrite="true">
+ <fileset refid="jbossws.deploy.files"/>
+ </copy>
+
+ <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
+ <echo file="${core.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/>
+ <replace file="${core.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/>
+ <copy todir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${core.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/>
+
</sequential>
</macrodef>
@@ -529,44 +444,12 @@
<sequential>
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <loadfile property="jbossws.undeploy.files" srcfile="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/>
+ <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete>
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss501.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss501.home}/client">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss501.home}/server/${jboss.server.instance}/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
+ <fileset dir="${jboss501.home}" includes="${jbossws.undeploy.files}"/>
</delete>
- <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-02-25 11:02:26 UTC (rev 5790)
+++ stack/native/trunk/build.xml 2008-02-25 11:08:37 UTC (rev 5791)
@@ -105,6 +105,7 @@
<property name="core.resources.dir" value="${core.src.dir}/resources"/>
<property name="core.output.dir" value="${core.dir}/output"/>
<property name="core.output.apidocs.dir" value="${core.output.dir}/apidocs"/>
+ <property name="core.output.deploy.dir" value="${core.output.dir}/deploy"/>
<property name="core.output.etc.dir" value="${core.output.dir}/etc"/>
<property name="core.output.classes.dir" value="${core.output.dir}/classes"/>
<property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
16 years, 10 months
JBossWS SVN: r5790 - framework/trunk/src/test/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-25 06:02:26 -0500 (Mon, 25 Feb 2008)
New Revision: 5790
Modified:
framework/trunk/src/test/ant-import/build-testsuite.xml
Log:
decrease hudson 501 regression - jbossweb deployer changed from beta4
Modified: framework/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-testsuite.xml 2008-02-25 08:26:38 UTC (rev 5789)
+++ framework/trunk/src/test/ant-import/build-testsuite.xml 2008-02-25 11:02:26 UTC (rev 5790)
@@ -244,6 +244,7 @@
<pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
<pathelement location="${tools.jar}"/>
<!-- WS-RM backports server dependencies -->
+ <pathelement location="${jboss.server.deploy}/jbossweb.sar/jbossweb.jar"/>
<pathelement location="${jboss.server.deployers}/jbossweb.deployer/jbossweb.jar"/>
</path>
</target>
16 years, 10 months
JBossWS SVN: r5789 - framework/trunk/src/test/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-25 03:26:38 -0500 (Mon, 25 Feb 2008)
New Revision: 5789
Modified:
framework/trunk/src/test/ant-import/build-testsuite.xml
Log:
Add stax-api to AS50 client cp
Modified: framework/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-testsuite.xml 2008-02-23 22:10:01 UTC (rev 5788)
+++ framework/trunk/src/test/ant-import/build-testsuite.xml 2008-02-25 08:26:38 UTC (rev 5789)
@@ -194,6 +194,7 @@
<pathelement location="${jboss.client}/jboss-remoting.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
<pathelement location="${jboss.client}/wsdl4j.jar"/>
<pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
16 years, 10 months
JBossWS SVN: r5788 - in stack/native/trunk/src/test: resources/tools/jbws1217 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2008-02-23 17:10:01 -0500 (Sat, 23 Feb 2008)
New Revision: 5788
Added:
stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl
stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java
stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java
stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml
stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml
Log:
[JBWS-1217] Modified testcase to test base types too.
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-02-23 22:05:55 UTC (rev 5787)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-02-23 22:10:01 UTC (rev 5788)
@@ -46,7 +46,8 @@
compareSource(resourceDir + "/MySEIService.java", toolsDir + "/org/jboss/test/ws/jbws1217/MySEIService.java");
compareSource(resourceDir + "/MySEI.java", toolsDir + "/org/jboss/test/ws/jbws1217/MySEI.java");
- compareSource(resourceDir + "/TestException.java", toolsDir + "/com/other/TestException.java");
+ compareSource(resourceDir + "/TestException.java", toolsDir + "/com/other/exception/TestException.java");
+ compareSource(resourceDir + "/BaseException.java", toolsDir + "/com/other/base/BaseException.java");
JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
Added: stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java 2008-02-23 22:10:01 UTC (rev 5788)
@@ -0,0 +1,18 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun Feb 24 03:13:31 IST 2008
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package com.other.base;
+
+
+public class BaseException
+ extends Exception{
+public BaseException(){
+}
+}
Property changes on: stack/native/trunk/src/test/resources/tools/jbws1217/BaseException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-02-23 22:05:55 UTC (rev 5787)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-02-23 22:10:01 UTC (rev 5788)
@@ -1,11 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions name='MySEIService' targetNamespace='http://org.jboss.test.ws/jbws1217' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://other.com' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1217' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
<types>
- <schema targetNamespace='http://other.com' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://other.com' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='TestException'>
- <sequence/>
+ <schema targetNamespace='http://other.com' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://other.com' xmlns:ns1='http://other.com.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <import namespace='http://other.com.base'/>
+ <complexType name='TestException'>
+ <complexContent>
+ <extension base="ns1:BaseException">
+ <sequence/>
+ </extension>
+ </complexContent>
</complexType>
<element name='TestException' type='tns:TestException'/>
+ </schema>
+ <schema targetNamespace='http://other.com.base' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://other.com.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='BaseException'>
+ <sequence/>
+ </complexType>
+ <element name="BaseException" type="tns:BaseException"/>
</schema>
</types>
<message name='MySEI_testException'/>
Modified: stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java 2008-02-23 22:05:55 UTC (rev 5787)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/MySEI.java 2008-02-23 22:10:01 UTC (rev 5788)
@@ -1,7 +1,7 @@
/*
* JBossWS WS-Tools Generated Source
*
- * Generation Date: Thu Jan 03 16:38:10 IST 2008
+ * Generation Date: Sun Feb 24 03:13:31 IST 2008
*
* This generated source code represents a derivative work of the input to
* the generator that produced it. Consult the input for the copyright and
@@ -11,5 +11,5 @@
public interface MySEI extends java.rmi.Remote
{
- public void testException() throws com.other.TestException, java.rmi.RemoteException;
+ public void testException() throws com.other.exception.TestException, java.rmi.RemoteException;
}
Modified: stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java 2008-02-23 22:05:55 UTC (rev 5787)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/TestException.java 2008-02-23 22:10:01 UTC (rev 5788)
@@ -1,18 +1,18 @@
/*
* JBossWS WS-Tools Generated Source
*
- * Generation Date: Thu Jan 03 16:24:09 IST 2008
+ * Generation Date: Sun Feb 24 03:13:31 IST 2008
*
* This generated source code represents a derivative work of the input to
* the generator that produced it. Consult the input for the copyright and
* terms of use that apply to this source code.
*/
-package com.other;
+package com.other.exception;
public class TestException
- extends Exception{
+ extends com.other.base.BaseException{
public TestException(){
}
}
Modified: stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-02-23 22:05:55 UTC (rev 5787)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-02-23 22:10:01 UTC (rev 5788)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
<package-mapping>
- <package-type>com.other</package-type>
+ <package-type>com.other.exception</package-type>
<namespaceURI>http://other.com</namespaceURI>
</package-mapping>
<package-mapping>
@@ -8,12 +8,12 @@
<namespaceURI>http://org.jboss.test.ws/jbws1217</namespaceURI>
</package-mapping>
<java-xml-type-mapping>
- <java-type>com.other.TestException</java-type>
+ <java-type>com.other.exception.TestException</java-type>
<root-type-qname xmlns:typeNS='http://other.com'>typeNS:TestException</root-type-qname>
<qname-scope>complexType</qname-scope>
</java-xml-type-mapping>
<exception-mapping>
- <exception-type>com.other.TestException</exception-type>
+ <exception-type>com.other.exception.TestException</exception-type>
<wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws1217'>exMsgNS:TestException</wsdl-message>
</exception-mapping>
<service-interface-mapping>
Modified: stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml 2008-02-23 22:05:55 UTC (rev 5787)
+++ stack/native/trunk/src/test/resources/tools/jbws1217/wstools-config.xml 2008-02-23 22:10:01 UTC (rev 5788)
@@ -1,6 +1,7 @@
<configuration xmlns="http://www.jboss.org/jbossws-tools">
<global>
- <package-namespace package="com.other" namespace="http://other.com"/>
+ <package-namespace package="com.other.exception" namespace="http://other.com"/>
+ <package-namespace package="com.other.base" namespace="http://other.com.base"/>
<package-namespace package="org.jboss.test.ws.jbws1217" namespace="http://org.jboss.test.ws/jbws1217"/>
</global>
<wsdl-java location="resources/tools/jbws1217/MultiplePackageNamespace.wsdl">
16 years, 10 months
JBossWS SVN: r5787 - in stack/native/trunk/src/main/java/org/jboss/ws/tools: helpers and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2008-02-23 17:05:55 -0500 (Sat, 23 Feb 2008)
New Revision: 5787
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/XSDToJava.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java
Log:
[JBWS-1217] Added multiple package support for base types too.
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-02-23 10:45:44 UTC (rev 5786)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-02-23 22:05:55 UTC (rev 5787)
@@ -315,7 +315,6 @@
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
QName faultXMLName = intfFault.getElement();
QName faultXMLType = intfFault.getXmlType();
-
XSElementDeclaration xe = xsmodel.getElementDeclaration(faultXMLName.getLocalPart(), faultXMLName.getNamespaceURI());
XSTypeDefinition xt = xe.getTypeDefinition();
if (!xt.getAnonymous())
@@ -524,7 +523,6 @@
if (unwrappedElement)
{
buf.append(tempBuf);
-
// We need a wrapper class generated
generateJavaSource(wrapper, WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()), containingElement);
@@ -810,7 +808,7 @@
private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement, boolean exception) throws IOException
{
- XSDTypeToJava xtj = new XSDTypeToJava();
+ XSDTypeToJava xtj = new XSDTypeToJava(namespacePackageMap);
xtj.setTypeMapping(this.typeMapping);
String targetNS = wsdl.getTargetNamespace();
String tgtNS = xt.getNamespace();
@@ -819,7 +817,7 @@
{
File dir = utils.createPackage(this.directoryToGenerate, packName);
}
- xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(packName), packName, xsmodel, exception);
+ xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, this.directoryToGenerate, packName, xsmodel, exception);
}
public void setParameterStyle(String paramStyle)
@@ -838,7 +836,6 @@
return pkg;
}
}
-
//return NamespacePackageMapping.getJavaPackageName(targetNamespace);
//Default behaviour will always generate all classes in the SEI package only
return seiPkgName;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/XSDToJava.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/XSDToJava.java 2008-02-23 10:45:44 UTC (rev 5786)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/XSDToJava.java 2008-02-23 22:05:55 UTC (rev 5787)
@@ -55,7 +55,7 @@
/**
* Utility class that converts a XSD Type into a Java class
*/
- protected XSDTypeToJava xsdJava = new XSDTypeToJava();
+ protected XSDTypeToJava xsdJava = new XSDTypeToJava(null);
private LiteralTypeMapping typeMapping = null;
@@ -69,9 +69,7 @@
{
XSLoader xsloader = SchemaUtils.getInstance().getXSLoader();
XSModel xsmodel = xsloader.loadURI(schemaFile);
-
- if (createPackageDir) dirloc = utils.createPackage(dirloc.getAbsolutePath(), packageName);
- generateJavaSource(xsmodel, dirloc, packageName);
+ generateJavaSource(xsmodel, dirloc, packageName, createPackageDir);
}
@@ -82,7 +80,10 @@
boolean createPackageDir)
throws IOException
{
- if (createPackageDir) dirloc = utils.createPackage(dirloc.getAbsolutePath(), packageName);
+ if (createPackageDir)
+ {
+ utils.createPackage(dirloc.getAbsolutePath(), packageName);
+ }
generateJavaSource(xsmodel, dirloc, packageName);
}
@@ -106,7 +107,7 @@
String tname = type.getName();
if (Constants.NS_SCHEMA_XSD.equals(nsuri) && "anyType".equals(tname)) continue;
checkXSDTypeToJava();
- xsdJava.createJavaFile(ctype, dirloc, packageName, xsmodel);
+ xsdJava.createJavaFile(ctype, dirloc.getPath(), packageName, xsmodel);
}
else if (type instanceof XSSimpleTypeDefinition)
{
@@ -116,7 +117,7 @@
String tname = type.getName();
if (Constants.NS_SCHEMA_XSD.equals(nsuri) && "anyType".equals(tname)) continue;
checkXSDTypeToJava();
- xsdJava.createJavaFile(stype, dirloc, packageName, xsmodel);
+ xsdJava.createJavaFile(stype, dirloc.getPath(), packageName, xsmodel);
}
}
@@ -158,13 +159,13 @@
if (type.getName() != null)
throw new IllegalArgumentException(str);
checkXSDTypeToJava();
- xsdJava.createJavaFile(type,outerElementName, loc,pkgname,schema, false);
+ xsdJava.createJavaFile(type,outerElementName,loc.getPath(),pkgname,schema, false);
}
private void checkXSDTypeToJava()
{
if(xsdJava == null)
- xsdJava = new XSDTypeToJava();
+ xsdJava = new XSDTypeToJava(null);
xsdJava.setTypeMapping(typeMapping);
}
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-02-23 10:45:44 UTC (rev 5786)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-02-23 22:05:55 UTC (rev 5787)
@@ -71,11 +71,13 @@
//Additional variables
protected String containingElement = "";
protected String fname = "";
- protected File loc = null;
+ protected String loc = null;
protected String pkgname = "";
private Set<String> generatedFiles = new HashSet<String>();
+ protected Map<String, String> namespacePackageMap = null;
+
/**
* List that is used for exception inheritance case wherein the variables
* obtained from the base class go into the generated constructor alone and
@@ -83,11 +85,12 @@
*/
private Map<String, List> typeNameToBaseVARList = new HashMap<String, List>();
- public XSDTypeToJava()
+ public XSDTypeToJava(Map<String, String> map)
{
+ this.namespacePackageMap = map;
}
- public void createJavaFile(XSComplexTypeDefinition type, File loc, String pkgname, XSModel schema) throws IOException
+ public void createJavaFile(XSComplexTypeDefinition type, String loc, String pkgname, XSModel schema) throws IOException
{
if (typeMapping == null)
throw new WSException("TypeMapping has not been set");
@@ -100,7 +103,7 @@
createJavaFile(type, schema, false);
}
- public void createJavaFile(XSComplexTypeDefinition type, String containingElement, File loc, String pkgname, XSModel schema, boolean isExceptionType)
+ public void createJavaFile(XSComplexTypeDefinition type, String containingElement, String loc, String pkgname, XSModel schema, boolean isExceptionType)
throws IOException
{
if (typeMapping == null)
@@ -115,7 +118,7 @@
createJavaFile(type, schema, isExceptionType);
}
- public void createJavaFile(XSSimpleTypeDefinition type, File loc, String pkgname, XSModel schema) throws IOException
+ public void createJavaFile(XSSimpleTypeDefinition type, String loc, String pkgname, XSModel schema) throws IOException
{
if (typeMapping == null)
throw new WSException("TypeMapping has not been set");
@@ -153,8 +156,15 @@
vars = this.getVARList(type, schema, isExceptionType);
if (baseName == null && isExceptionType)
+ {
baseName = "Exception";
- jwriter.createJavaFile(loc, fname, pkgname, vars, null, baseName, isExceptionType, typeNameToBaseVARList);
+ }
+ else if (baseName != null)
+ {
+ baseName = getPackageName(baseType.getNamespace()) + "." + baseName;
+ }
+ String packageName = getPackageName(type.getNamespace());
+ jwriter.createJavaFile(getLocationForJavaGeneration(packageName), fname, packageName, vars, null, baseName, isExceptionType, typeNameToBaseVARList);
}
public void createJavaFile(XSSimpleTypeDefinition xsSimple, XSModel schema) throws IOException
@@ -171,7 +181,8 @@
if (slist != null && slist.getLength() > 0)
{
//Enumerated List
- jwriter.createJavaFileForEnumeratedValues(fname, slist, loc, pkgname, xsSimple);
+ String packageName = getPackageName(xsSimple.getNamespace());
+ jwriter.createJavaFileForEnumeratedValues(fname, slist, getLocationForJavaGeneration(packageName), packageName, xsSimple);
}
else
{
@@ -268,6 +279,16 @@
this.typeMapping = tm;
}
+ public Map<String, String> getNamespacePackageMap()
+ {
+ return namespacePackageMap;
+ }
+
+ public void setNamespacePackageMap(Map<String, String> map)
+ {
+ this.namespacePackageMap = map;
+ }
+
//PRIVATE METHODS
private void handleContentTypeElementsWithDerivationRestriction(XSComplexTypeDefinition type, XSModel schema, List vars, XSParticle xsparticle) throws IOException
@@ -425,7 +446,7 @@
XSSimpleTypeDefinition xstype = att.getTypeDefinition();
QName qn = SchemaUtils.handleSimpleType(xstype);
boolean primitive = obj.getRequired();
- VAR v = createVAR(qn, att.getName(), pkgname, primitive);
+ VAR v = createVAR(qn, att.getName(), getPackageName(xstype.getNamespace()), primitive);
if (vars == null)
vars = new ArrayList();
vars.add(v);
@@ -565,7 +586,7 @@
{
// it is a composite type
QName qn = new QName(origType.getNamespace(), origType.getName());
- VAR vr = createVAR(qn, elem, (XSComplexTypeDefinition)xstypedef, tname, pkgname, arrayType);
+ VAR vr = createVAR(qn, elem, (XSComplexTypeDefinition)xstypedef, tname, getPackageName(origType.getNamespace()), arrayType);
vars.add(vr);
return vars;
}
@@ -604,7 +625,7 @@
this.fname = tempfname;
// Bypass rest of processing
QName anonqn = new QName(anonName);
- VAR vr = createVAR(anonqn, elem, xsc, tname, pkgname, arrayType);
+ VAR vr = createVAR(anonqn, elem, xsc, tname, getPackageName(xsc.getNamespace()), arrayType);
vars.add(vr);
return vars;
}
@@ -643,7 +664,7 @@
this.fname = temp;
}
- VAR v = createVAR(qn, elem, xstypedef, tname, pkgname, arrayType);
+ VAR v = createVAR(qn, elem, xstypedef, tname, getPackageName(xstypedef.getNamespace()), arrayType);
vars.add(v);
}
return vars;
@@ -764,4 +785,25 @@
isArrayType = arrayType;
}
}
+
+ private File getLocationForJavaGeneration(String packageName)
+ {
+ File locdir = new File(this.loc);
+ locdir = wsdlUtils.createPackage(locdir.getAbsolutePath(), packageName);
+ return locdir;
+ }
+
+ private String getPackageName(String targetNamespace)
+ {
+ //Get it from global config
+ if (namespacePackageMap != null)
+ {
+ String pkg = namespacePackageMap.get(targetNamespace);
+ if (pkg != null)
+ {
+ return pkg;
+ }
+ }
+ return this.pkgname;
+ }
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-02-23 10:45:44 UTC (rev 5786)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-02-23 22:05:55 UTC (rev 5787)
@@ -947,7 +947,7 @@
String targetNS = wsdlDefinitions.getTargetNamespace();
MethodParamPartsMapping mppm = new MethodParamPartsMapping(semm);
mppm.setParamPosition(paramPosition);
- String javaType = getJavaTypeAsString(xmlName, xmlType, targetNS, array, primitive);
+ String javaType = getJavaTypeAsString(xmlName, xmlType, xmlType.getNamespaceURI(), array, primitive);
mppm.setParamType(javaType);
//WSDL Message Mapping
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-02-23 10:45:44 UTC (rev 5786)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-02-23 22:05:55 UTC (rev 5787)
@@ -212,7 +212,7 @@
throws IOException
{
WSDLUtils utils = WSDLUtils.getInstance();
- XSDTypeToJava xst = new XSDTypeToJava();
+ XSDTypeToJava xst = new XSDTypeToJava(namespacePackageMap);
xst.setTypeMapping(this.typeMapping);
xst.setPackageName(getPackageName(typeNamespace));
ServiceEndpointMethodMapping[] mapArr = seim.getServiceEndpointMethodMappings();
16 years, 10 months
JBossWS SVN: r5786 - in framework/trunk/src/test: java/org/jboss/test/ws/jaxws/smoke/tools/service and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-23 05:45:44 -0500 (Sat, 23 Feb 2008)
New Revision: 5786
Removed:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld_Service.java
Modified:
framework/trunk/src/test/ant-import/build-jars-jaxws.xml
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.java
Log:
fixing hudson regression
Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-02-23 10:33:27 UTC (rev 5785)
+++ framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-02-23 10:45:44 UTC (rev 5786)
@@ -417,7 +417,6 @@
<jar destfile="${tests.output.dir}/libs/jaxws-classloading-service.jar">
<fileset dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.class"/>
- <include name="org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld_Service.class"/>
</fileset>
</jar>
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.java 2008-02-23 10:33:27 UTC (rev 5785)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.java 2008-02-23 10:45:44 UTC (rev 5786)
@@ -16,7 +16,7 @@
*
*/
@WebService(name = "HelloWorld", targetNamespace = "http://jbws1776/wsdl/")
-public interface HelloWorld {
+public class HelloWorld {
/**
@@ -31,6 +31,9 @@
@ResponseWrapper(localName = "echoResponse", targetNamespace = "http://jbws1776/wsdl/", className = "org.jboss.test.ws.jaxws.smoke.tools.service.EchoResponse")
public Message echo(
@WebParam(name = "p0", targetNamespace = "http://jbws1776/wsdl/")
- Message p0);
+ Message p0)
+ {
+ return null;
+ }
}
Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld_Service.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld_Service.java 2008-02-23 10:33:27 UTC (rev 5785)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld_Service.java 2008-02-23 10:45:44 UTC (rev 5786)
@@ -1,53 +0,0 @@
-
-package org.jboss.test.ws.jaxws.smoke.tools.service;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1-b03-
- * Generated source version: 2.0
- *
- */
-@WebServiceClient(name = "HelloWorld", targetNamespace = "http://jbws1776/wsdl/", wsdlLocation = "file:/opt/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA/bin/Definitions.wsdl")
-public class HelloWorld_Service
- extends Service
-{
-
- private final static URL HELLOWORLD_WSDL_LOCATION;
-
- static {
- URL url = null;
- try {
- url = new URL("file:/opt/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA/bin/Definitions.wsdl");
- } catch (MalformedURLException e) {
- e.printStackTrace();
- }
- HELLOWORLD_WSDL_LOCATION = url;
- }
-
- public HelloWorld_Service(URL wsdlLocation, QName serviceName) {
- super(wsdlLocation, serviceName);
- }
-
- public HelloWorld_Service() {
- super(HELLOWORLD_WSDL_LOCATION, new QName("http://jbws1776/wsdl/", "HelloWorld"));
- }
-
- /**
- *
- * @return
- * returns HelloWorld
- */
- @WebEndpoint(name = "HelloWorld")
- public HelloWorld getHelloWorld() {
- return (HelloWorld)super.getPort(new QName("http://jbws1776/wsdl/", "HelloWorld"), HelloWorld.class);
- }
-
-}
16 years, 10 months
JBossWS SVN: r5785 - stack/metro/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-23 05:33:27 -0500 (Sat, 23 Feb 2008)
New Revision: 5785
Modified:
stack/metro/trunk/build.xml
Log:
repair clean ant target
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-02-23 07:58:54 UTC (rev 5784)
+++ stack/metro/trunk/build.xml 2008-02-23 10:33:27 UTC (rev 5785)
@@ -304,8 +304,8 @@
<!-- ================================================================== -->
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${metro.output.dir}"/>
- <delete dir="thirdparty.gen"/>
+ <delete dir="glassfish-metro"/>
+ <delete dir="output"/>
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
16 years, 10 months