JBossWS SVN: r3791 - in branches/jbossws-2.0/integration: jboss50/src/main/java/org/jboss/wsf/container/jboss50 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-03 10:18:50 -0400 (Tue, 03 Jul 2007)
New Revision: 3791
Modified:
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
Log:
Adapt EJB3 meta databefore EJB21. Errorneously both may exist
Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-03 12:37:30 UTC (rev 3790)
+++ branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-03 14:18:50 UTC (rev 3791)
@@ -117,13 +117,13 @@
udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di);
udi.webappURL = udi.url;
}
+ else if (udi.type == DeploymentType.JAXRPC_EJB3 || udi.type == DeploymentType.JAXWS_EJB3)
+ {
+ udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi);
+ }
else if (di.metaData instanceof ApplicationMetaData)
{
udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di);
}
- else if (udi.type == DeploymentType.JAXRPC_EJB3 || udi.type == DeploymentType.JAXWS_EJB3)
- {
- udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi);
- }
}
}
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-03 12:37:30 UTC (rev 3790)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-03 14:18:50 UTC (rev 3791)
@@ -108,13 +108,13 @@
udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit);
udi.webappURL = udi.vfRoot.toURL();
}
+ else if (unit.getAttachment(Ejb3Deployment.class) != null)
+ {
+ udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit);
+ }
else if (unit.getAttachment(ApplicationMetaData.class) != null)
{
udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, unit);
}
- else if (unit.getAttachment(Ejb3Deployment.class) != null)
- {
- udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit);
- }
}
}
17 years, 5 months
JBossWS SVN: r3790 - branches/jbossws-2.0/integration/native/ant-import.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-07-03 08:37:30 -0400 (Tue, 03 Jul 2007)
New Revision: 3790
Modified:
branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
Log:
Remove jbossws-integration.jar when installing the WSF
Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-07-03 10:00:23 UTC (rev 3789)
+++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-07-03 12:37:30 UTC (rev 3790)
@@ -120,6 +120,8 @@
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
</fileset>
</delete>
<delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
@@ -225,6 +227,8 @@
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
</fileset>
</delete>
<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
17 years, 5 months
JBossWS SVN: r3789 - branches/jbossws-2.0/build.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-03 06:00:23 -0400 (Tue, 03 Jul 2007)
New Revision: 3789
Modified:
branches/jbossws-2.0/build/ant.properties.example
Log:
#jboss50.home=/home/tdiesler/svn/jbossas/branches/JBoss_5_0_0_Beta2_JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2
#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA
#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
Modified: branches/jbossws-2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-2.0/build/ant.properties.example 2007-07-02 19:07:35 UTC (rev 3788)
+++ branches/jbossws-2.0/build/ant.properties.example 2007-07-03 10:00:23 UTC (rev 3789)
@@ -6,7 +6,7 @@
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/branches/JBoss_5_0_0_Beta2_JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2
#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA
-#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3
+#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40]
jbossws.integration.target=jboss50
@@ -40,8 +40,8 @@
hudson.jboss42.build=jboss-4.2.0.GA
hudson.jboss42.rev=HEAD
-hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA_CP05
-hudson.jboss40.build=jboss-4.0.5.GA_CP05
+hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA
+hudson.jboss40.build=jboss-4.0.5.GA
hudson.jboss40.rev=HEAD
hudson.mail.recipients=thomas.diesler(a)jboss.com, heiko.braun(a)jboss.com
17 years, 5 months
JBossWS SVN: r3788 - branches/jbossws-2.0/integration/native.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-02 15:07:35 -0400 (Mon, 02 Jul 2007)
New Revision: 3788
Modified:
branches/jbossws-2.0/integration/native/build.xml
Log:
Include jbossws-context.war
Modified: branches/jbossws-2.0/integration/native/build.xml
===================================================================
--- branches/jbossws-2.0/integration/native/build.xml 2007-07-02 18:53:15 UTC (rev 3787)
+++ branches/jbossws-2.0/integration/native/build.xml 2007-07-02 19:07:35 UTC (rev 3788)
@@ -131,11 +131,10 @@
<!-- Build jbossws-native50.sar -->
<jar jarfile="${native.output.lib.dir}/jbossws-native50.sar" manifest="${native.output.etc.dir}/default.mf">
- <!-- [JBAS-4379] MC beans deployed twice because of jacc service
+ <!-- [JBAS-4379] MC beans deployed twice because of jacc service -->
<fileset dir="${native.output.lib.dir}">
<include name="jbossws-context.war/**"/>
</fileset>
- -->
<fileset dir="${core.dir}/output/lib">
<include name="jbossws-core.jar"/>
</fileset>
17 years, 6 months
JBossWS SVN: r3787 - branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-02 14:53:15 -0400 (Mon, 02 Jul 2007)
New Revision: 3787
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
Log:
[JBWS-771] Use part names that are friendly to .NET
Do not use 'parameters' for header parts
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-07-02 15:10:47 UTC (rev 3786)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-07-02 18:53:15 UTC (rev 3787)
@@ -30,7 +30,6 @@
import java.util.Set;
import java.util.StringTokenizer;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
@@ -106,13 +105,7 @@
this.opMetaData = opMetaData;
this.mode = ParameterMode.IN;
this.javaTypeName = javaTypeName;
-
- // [JBWS-771] Use part names that are friendly to .NET
- if (opMetaData.isDocumentWrapped())
- partName = "parameters";
- else
- partName = xmlName.getLocalPart();
-
+ this.partName = xmlName.getLocalPart();
}
private static boolean matchParameter(Method method, int index, Class expectedType, Set<Integer> matches, boolean exact, boolean holder)
@@ -440,7 +433,11 @@
public String getPartName()
{
- return partName;
+ // [JBWS-771] Use part names that are friendly to .NET
+ if (opMetaData.isDocumentWrapped() && inHeader == false)
+ return "parameters";
+ else
+ return partName;
}
public void setPartName(String partName)
17 years, 6 months
JBossWS SVN: r3786 - branches/jbossws-2.0/integration/native/ant-import.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-07-02 11:10:47 -0400 (Mon, 02 Jul 2007)
New Revision: 3786
Modified:
branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
Log:
Update wsdl4j and jbossxb for 4.0.5 installations
Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-07-02 13:27:15 UTC (rev 3785)
+++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-07-02 15:10:47 UTC (rev 3786)
@@ -13,384 +13,395 @@
<project>
- <!-- ================================================================== -->
- <!-- Deployment JBossWS/Native -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Deployment JBossWS/Native -->
+ <!-- ================================================================== -->
- <macrodef name="macro-deploy-native50">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="corelibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+ <macrodef name="macro-deploy-native50">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss50.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="policy.jar"/>
- <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="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss50.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>
- <!-- SERVER JARS -->
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
-
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-native50-deployer.zip"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="policy.jar"/>
+ <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="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
- <macrodef name="macro-undeploy-native50">
- <sequential>
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
-
- <delete>
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss50.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss50.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-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-jboss50.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 -->
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
- <!-- SERVER JARS -->
- <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-jboss50.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-native50-deployer.zip"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
- <macrodef name="macro-deploy-native42">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="corelibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss42.home}/client" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="policy.jar"/>
- <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="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS -->
- <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- </copy>
+ <macrodef name="macro-undeploy-native50">
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
+ <delete>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss50.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
- <macrodef name="macro-undeploy-native42">
- <sequential>
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss42.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss42.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-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-jboss42.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="${jboss42.home}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- </fileset>
- <fileset dir="${jboss42.home}/lib">
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
- </fileset>
- <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-jboss42.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss50.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-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-jboss50.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>
- <macrodef name="macro-deploy-native40">
- <attribute name="spilibs"/>
- <attribute name="jbosslibs"/>
- <attribute name="corelibs"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss40.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss40.home}/client" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss40.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="policy.jar"/>
- <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="stax-api.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS -->
- <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss40.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss50.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
- <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/>
- <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-setup-native40-no-ejb3">
- <sequential>
-
- <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml"
- file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/>
- <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"
- file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
-
- <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml"
- file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
- <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"
- file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/>
-
- </sequential>
- </macrodef>
+ <macrodef name="macro-deploy-native42">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <macrodef name="macro-undeploy-native40">
- <sequential>
- <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
- <delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss40.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss40.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-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-jboss40.jar"/>
- <include name="policy.jar"/>
- <include name="stax-api.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"/>
- <include name="jbossws14-client.jar"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss40.home}/lib">
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
- </fileset>
- <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib">
- <include name="jbossws-jboss40.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <!-- Remove only, do not deploy -->
- <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
- </sequential>
- </macrodef>
-
- <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 -->
- <macrodef name="macro-deploy-endorsed">
- <attribute name="jbosshome"/>
- <attribute name="corelibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <copy todir="@{jbosshome}/lib/endorsed" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>
- <!-- Undeploy API jars from lib/endorsed -->
- <macrodef name="macro-undeploy-endorsed">
- <attribute name="jbosshome"/>
- <sequential>
- <delete>
- <fileset dir="@{jbosshome}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- </sequential>
- </macrodef>
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="policy.jar"/>
+ <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="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+ <!-- SERVER JARS -->
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native42">
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <delete>
+
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss42.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss42.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-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-jboss42.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="${jboss42.home}/lib/endorsed">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/lib">
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss42.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-native40">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss40.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/>
+
+ <copy todir="${jboss40.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss40.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss40.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="policy.jar"/>
+ <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="stax-api.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS -->
+ <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss40.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="wsdl4j.jar"/>
+ </fileset>
+
+ </copy>
+
+ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/>
+ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-setup-native40-no-ejb3">
+ <sequential>
+
+ <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/>
+ <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
+
+ <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
+ <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/>
+
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native40">
+ <sequential>
+ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
+ <delete>
+
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss40.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss40.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-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-jboss40.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-api.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"/>
+ <include name="jbossws14-client.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss40.home}/lib">
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss40.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <!-- Remove only, do not deploy -->
+ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 -->
+ <macrodef name="macro-deploy-endorsed">
+ <attribute name="jbosshome"/>
+ <attribute name="corelibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <copy todir="@{jbosshome}/lib/endorsed" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- Undeploy API jars from lib/endorsed -->
+ <macrodef name="macro-undeploy-endorsed">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
+ <fileset dir="@{jbosshome}/lib/endorsed">
+ <include name="jaxb-api.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ </sequential>
+ </macrodef>
+
</project>
17 years, 6 months
JBossWS SVN: r3784 - branches/jbossws-2.0/build.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-02 07:46:55 -0400 (Mon, 02 Jul 2007)
New Revision: 3784
Modified:
branches/jbossws-2.0/build/ant.properties.example
Log:
Use branches/JBoss_5_0_0_Beta2_JBossWS_2_0_0_GA
Modified: branches/jbossws-2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-2.0/build/ant.properties.example 2007-07-02 11:42:40 UTC (rev 3783)
+++ branches/jbossws-2.0/build/ant.properties.example 2007-07-02 11:46:55 UTC (rev 3784)
@@ -32,7 +32,7 @@
hudson.admin.port=8150
hudson.http.port=8180
-hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/branches/JBossWS_2_0_0_GA
+hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/branches/branches/JBoss_5_0_0_Beta2_JBossWS_2_0_0_GA
hudson.jboss50.build=jboss-5.0.0.Beta2
hudson.jboss50.rev=HEAD
17 years, 6 months
JBossWS SVN: r3783 - in branches/jbossws-2.0/build/hudson/hudson-home/jobs: AS-4.2 and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-02 07:42:40 -0400 (Mon, 02 Jul 2007)
New Revision: 3783
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml
Log:
Use generic AS checkout names
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-07-02 11:42:40 UTC (rev 3783)
@@ -6,8 +6,7 @@
#
# Module settings
#
-MODULE=AS-4.0
-SVNBASE=`basename @hudson.jboss40.url@`
+SVNBASE=JBossAS-4.0
#
# checkout with an explicit version
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-07-02 11:42:40 UTC (rev 3783)
@@ -6,8 +6,7 @@
#
# Module settings
#
-MODULE=AS-4.2
-SVNBASE=`basename @hudson.jboss42.url@`
+SVNBASE=JBossAS-4.2
#
# checkout with an explicit version
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-07-02 11:42:40 UTC (rev 3783)
@@ -6,8 +6,7 @@
#
# Module settings
#
-MODULE=AS-5.0
-SVNBASE=`basename @hudson.jboss50.url@`
+SVNBASE=JBossAS-5.0
#
# checkout with an explicit version
@@ -23,7 +22,7 @@
#
cd $SVNBASE
rm -rf thirdparty/*
-ant -f ./build/build.xml clean main
+./build/build.sh clean main
#
# Verify build
17 years, 6 months
JBossWS SVN: r3782 - in branches/jbossws-2.0/build/hudson/hudson-home/jobs: AS-4.2 and 14 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-02 07:18:21 -0400 (Mon, 02 Jul 2007)
New Revision: 3782
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
Log:
Use generic AS checkout names
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -50,7 +50,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.jboss40.url@</remote>
- <local>AS40</local>
+ <local>JBossAS-4.0</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -50,7 +50,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.jboss42.url@</remote>
- <local>AS42</local>
+ <local>JBossAS-4.2</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -50,7 +50,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.jboss50.url@</remote>
- <local>AS50</local>
+ <local>JBossAS-5.0</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/AS40/build/output/(a)hudson.jboss40.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/(a)hudson.jboss40.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/AS50/build/output/(a)hudson.jboss50.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/AS40/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build(a)-ejb3
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/AS50/build/output/(a)hudson.jboss50.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,9 +11,9 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/AS50/build/output/(a)hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/AS40/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS_INSTANCE=$JBOSS40_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,9 +11,9 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/AS50/build/output/(a)hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/AS40/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS_INSTANCE=$JBOSS42_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,9 +11,9 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/AS50/build/output/(a)hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/AS40/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS_INSTANCE=$JBOSS50_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/AS40/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build(a)-ejb3
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-07-02 11:18:21 UTC (rev 3782)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/AS50/build/output/(a)hudson.jboss50.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
17 years, 6 months
JBossWS SVN: r3781 - in branches/jbossws-2.0/build/hudson/hudson-home/jobs: AS-4.2 and 14 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-02 07:08:45 -0400 (Mon, 02 Jul 2007)
New Revision: 3781
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
Log:
Use generic AS checkout names
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -50,7 +50,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.jboss40.url@</remote>
- <local>Branch_4_0</local>
+ <local>AS40</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -50,7 +50,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.jboss42.url@</remote>
- <local>JBoss_4_2_0_GA</local>
+ <local>AS42</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -50,7 +50,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@hudson.jboss50.url@</remote>
- <local>trunk</local>
+ <local>AS50</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/AS40/build/output/(a)hudson.jboss40.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/AS50/build/output/(a)hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/AS40/build/output/@hudson.jboss40.build(a)-ejb3
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/AS50/build/output/(a)hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,9 +11,9 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/AS50/build/output/(a)hudson.jboss50.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/AS40/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS_INSTANCE=$JBOSS40_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,9 +11,9 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/AS50/build/output/(a)hudson.jboss50.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/AS40/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS_INSTANCE=$JBOSS42_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,9 +11,9 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/AS50/build/output/(a)hudson.jboss50.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/AS40/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS_INSTANCE=$JBOSS50_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/AS40/build/output/@hudson.jboss40.build(a)-ejb3
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBoss_4_2_0_GA/build/output/(a)hudson.jboss42.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/AS42/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-07-02 06:44:51 UTC (rev 3780)
+++ branches/jbossws-2.0/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-07-02 11:08:45 UTC (rev 3781)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/AS50/build/output/(a)hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
17 years, 6 months