Author: thomas.diesler(a)jboss.com
Date: 2007-05-12 10:43:44 -0400 (Sat, 12 May 2007)
New Revision: 3057
Added:
trunk/jbossws-tests/README.txt
Modified:
trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml
trunk/jbws-jboss50/ant-import/build-deploy.xml
trunk/jbws-jboss50/ant-import/build-thirdparty.xml
trunk/jbws-jboss50/build.xml
trunk/jbws-jboss50/version.properties
Log:
Reuse core.thirdparty
Modified: trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml 2007-05-12
08:05:23 UTC (rev 3056)
+++ trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml 2007-05-12
14:43:44 UTC (rev 3057)
@@ -51,7 +51,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults>
+
<testResults>jbossws/sunri-jboss50/output-tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients(a)</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-12
08:05:23 UTC (rev 3056)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-12
14:43:44 UTC (rev 3057)
@@ -75,7 +75,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults>
+
<testResults>jbossws/jbws-jboss42/output-tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients(a)</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-12
08:05:23 UTC (rev 3056)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-12
14:43:44 UTC (rev 3057)
@@ -51,7 +51,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults>
+
<testResults>jbossws/jbws-jboss50/output-tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients(a)</recipients>
Added: trunk/jbossws-tests/README.txt
===================================================================
--- trunk/jbossws-tests/README.txt (rev 0)
+++ trunk/jbossws-tests/README.txt 2007-05-12 14:43:44 UTC (rev 3057)
@@ -0,0 +1,6 @@
+# $Id$
+
+This is the general collection of JAXWS test cases that should run with all
+supported web service stackes on all supported containers. In your testcases
+you MUST use the standard API only. In addition to that, the public API
+from jbossws-spi.jar MAY be used.
Property changes on: trunk/jbossws-tests/README.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbws-jboss50/ant-import/build-deploy.xml
===================================================================
--- trunk/jbws-jboss50/ant-import/build-deploy.xml 2007-05-12 08:05:23 UTC (rev 3056)
+++ trunk/jbws-jboss50/ant-import/build-deploy.xml 2007-05-12 14:43:44 UTC (rev 3057)
@@ -27,7 +27,7 @@
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
</fileset>
- <fileset dir="${thirdparty.dir}">
+ <fileset dir="${core.thirdparty.dir}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
@@ -36,7 +36,7 @@
</fileset>
</copy>
<copy todir="${jboss50.home}/lib" overwrite="true">
- <fileset dir="${thirdparty.dir}">
+ <fileset dir="${core.thirdparty.dir}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
</fileset>
Modified: trunk/jbws-jboss50/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 08:05:23 UTC (rev 3056)
+++ trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 14:43:44 UTC (rev 3057)
@@ -45,30 +45,6 @@
description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
- <get
src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar"
dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar"
dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar"
dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar"
dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar"
dest="${thirdparty.dir}/jboss-common-core-sources.jar"
usetimestamp="true" verbose="true"/>
- <get
src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar"
dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar"
dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar"
dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar"
dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar"
usetimestamp="true" verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar"
dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar"
dest="${thirdparty.dir}/jboss-xml-binding-sources.jar"
usetimestamp="true" verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar"
dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar"
dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip"
dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar"
dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip"
dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar"
dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip"
dest="${thirdparty.dir}/jboss-microcontainer-src.zip"
usetimestamp="true" verbose="true"/>
- <get
src="${jboss.repository}/jboss/security-spi/${jboss-security-spi}/lib/jboss-security-spi.jar"
dest="${thirdparty.dir}/jboss-security-spi.jar" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar"
dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar"
dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar"
dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar"
dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar"
dest="${thirdparty.dir}/policy.jar" usetimestamp="true"
verbose="true"/>
<checksum file="${basedir}/version.properties"
fileext=".md5"/>
</target>
@@ -77,7 +53,6 @@
<!-- The compile classpath for jboss50 integration -->
<path id="jboss50.integration.classpath">
- <path refid="core.thirdparty.classpath"/>
<pathelement location="${spi.dir}/output/classes"/>
<pathelement location="${core.dir}/output/classes"/>
<pathelement location="${core.dir}/output/classes14"/>
@@ -94,16 +69,7 @@
<pathelement
location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement
location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/>
<pathelement
location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
- <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <pathelement
location="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <path refid="core.thirdparty.classpath"/>
</path>
</target>
Modified: trunk/jbws-jboss50/build.xml
===================================================================
--- trunk/jbws-jboss50/build.xml 2007-05-12 08:05:23 UTC (rev 3056)
+++ trunk/jbws-jboss50/build.xml 2007-05-12 14:43:44 UTC (rev 3057)
@@ -40,7 +40,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="jboss50-init" depends="prepare, thirdparty">
+ <target name="jboss50-init" depends="prepare,thirdparty">
<fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
</target>
@@ -132,7 +132,7 @@
<fileset dir="${core.dir}/output/lib">
<include name="jbossws-core.jar"/>
</fileset>
- <fileset dir="${thirdparty.dir}">
+ <fileset dir="${core.thirdparty.dir}">
<include name="policy.jar"/>
<include name="wsdl4j.jar"/>
<include name="xmlsec.jar"/>
Modified: trunk/jbws-jboss50/version.properties
===================================================================
--- trunk/jbws-jboss50/version.properties 2007-05-12 08:05:23 UTC (rev 3056)
+++ trunk/jbws-jboss50/version.properties 2007-05-12 14:43:44 UTC (rev 3057)
@@ -1,32 +1,4 @@
# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $
-specification.title=JBossWS
-specification.vendor=JBoss (
http://www.jboss.org)
-specification.version=jbossws-2.1
-
-version.id=2.1.0.DEV
-repository.id=SNAPSHOT
-
-implementation.title=JBoss Web Services - JBossWS
-implementation.url=http://www.jboss.org/products/jbossws
-implementation.vendor=JBoss Inc.
-implementation.vendor.id=http://www.jboss.org
-
-# Thirdparty library versions
-apache-xmlsec=1.3.0
-ibm-wsdl4j=1.6.2
-jboss-common-core=2.0.2.GA
-jboss-common-logging-log4j=2.0.2.GA
-jboss-common-logging-spi=2.0.2.GA
-jboss-jaxr=1.2.0.GA
-jboss-jbossws=SNAPSHOT
-jboss-jbossws-spi=SNAPSHOT
-jboss-jbossxb=2.0.0.CR2
-jboss-microcontainer=2.0.0.Beta3
-jboss-security-spi=2.0.0.Beta
-jbossws-wsconsume-impl=2.0.0
-sun-jaxb=2.0.3jboss
-sun-servlet=2.4
-wscommons-policy=1.0
-
+# No versions different from core
\ No newline at end of file