[jboss-cvs] JBossAS SVN: r59217 - in branches/Branch_4_2: . build j2ee server testsuite varia
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Dec 23 15:56:22 EST 2006
Author: thomas.diesler at jboss.com
Date: 2006-12-23 15:56:17 -0500 (Sat, 23 Dec 2006)
New Revision: 59217
Removed:
branches/Branch_4_2/webservice/
Modified:
branches/Branch_4_2/build/build-distr.xml
branches/Branch_4_2/build/build.xml
branches/Branch_4_2/j2ee/build.xml
branches/Branch_4_2/server/build.xml
branches/Branch_4_2/testsuite/build.xml
branches/Branch_4_2/varia/build.xml
Log:
remove jbossws14
Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml 2006-12-23 20:55:13 UTC (rev 59216)
+++ branches/Branch_4_2/build/build-distr.xml 2006-12-23 20:56:17 UTC (rev 59217)
@@ -1407,6 +1407,10 @@
<fileset dir="${sun.jaf.lib}">
<include name="activation.jar"/>
</fileset>
+ <fileset dir="${sun.jaxb.lib}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
<fileset dir="${apache.logging.lib}">
<include name="commons-logging.jar"/>
</fileset>
@@ -1438,8 +1442,8 @@
<fileset dir="${jboss.jbossxb.lib}">
<include name="jboss-xml-binding.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws14.lib}">
- <include name="jbossws14-client.jar"/>
+ <fileset dir="${jboss.jbossws.lib}">
+ <include name="jbossws-client.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
@@ -1469,7 +1473,7 @@
<fileset dir="${jboss.jbossretro.rt.lib}">
<include name="jbossretro-rt.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws14.lib}">
+ <fileset dir="${jboss.jbossws.lib}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
@@ -1502,7 +1506,7 @@
<!-- install thirdparty items to install/bin -->
<!-- install wstools shell scripts -->
- <unjar dest="${install.bin}" src="${jboss.jbossws14.lib}/jbossws14-client.jar">
+ <unjar dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
<patternset>
<include name="wstools.*"/>
</patternset>
@@ -1510,8 +1514,8 @@
<!-- create deployments from thirdparty items -->
<!-- copy the jbossws14.sar -->
- <mkdir dir="${install.all.deploy}/jbossws14.sar"/>
- <unjar dest="${install.all.deploy}/jbossws14.sar" src="${jboss.jbossws14.lib}/jbossws14.sar"/>
+ <mkdir dir="${install.all.deploy}/jbossws.sar"/>
+ <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.lib}/jbossws.sar"/>
</target>
@@ -1529,7 +1533,7 @@
<include name="bin/**" />
<include name="client/**" />
<exclude name="client/jboss-backport-concurrent.jar" />
- <exclude name="client/jbossws14-client.jar" />
+ <exclude name="client/jbossws-client.jar" />
<exclude name="client/jbossretro-rt.jar" />
<exclude name="client/namespace.jar" />
<include name="lib/**" />
@@ -1600,7 +1604,7 @@
<fileset dir="${install.root}/server/default">
<include name="conf/**" />
<include name="deploy/**" />
- <exclude name="deploy/jbossws14.sar/**" />
+ <exclude name="deploy/jbossws.sar/**" />
<include name="lib/**" />
</fileset>
</copy>
@@ -1609,7 +1613,7 @@
<fileset dir="${install.root}/server/all">
<include name="conf/**" />
<include name="deploy/**" />
- <exclude name="deploy/jbossws14.sar/**" />
+ <exclude name="deploy/jbossws.sar/**" />
<include name="deploy-hasingleton/**" />
<include name="farm/**" />
<include name="lib/**" />
Modified: branches/Branch_4_2/build/build.xml
===================================================================
--- branches/Branch_4_2/build/build.xml 2006-12-23 20:55:13 UTC (rev 59216)
+++ branches/Branch_4_2/build/build.xml 2006-12-23 20:56:17 UTC (rev 59217)
@@ -717,9 +717,7 @@
<include name="hibernate-annotations.jar"/>
<include name="jboss-deployment.jar" />
<include name="jboss-j2ee.jar"/>
- <include name="jboss-jaxrpc.jar"/>
<include name="jboss-remoting.jar"/>
- <include name="jboss-saaj.jar"/>
<include name="jboss-serialization.jar"/>
<include name="jboss-xml-binding.jar"/>
<include name="jbossmqha.jar"/>
@@ -727,7 +725,6 @@
<include name="namespace.jar"/>
<include name="wsdl4j.jar"/>
<include name="xmlsec.jar"/>
- <exclude name="jbossws14-client.jar"/>
<exclude name="jbossws-client.jar"/>
</srcfiles>
</uptodate>
@@ -750,19 +747,15 @@
<include name="hibernate-annotations.jar"/>
<include name="jboss-deployment.jar" />
<include name="jboss-j2ee.jar"/>
- <include name="jboss-jaxrpc.jar"/>
<include name="jboss-remoting.jar"/>
- <include name="jboss-saaj.jar"/>
<include name="jboss-serialization.jar"/>
- <!-- Do not include jboss-xml-binding. Otherwise jbossws cannot be a drop in replacement.
- <include name="jboss-xml-binding.jar"/>
- -->
+ <!-- Do not include jboss-xml-binding. Otherwise jbossws cannot be a drop in replacement.
+ <include name="jboss-xml-binding.jar"/-->
<include name="jbossmqha.jar"/>
<include name="jmx-connector-client-factory.jar"/>
<include name="namespace.jar"/>
<include name="wsdl4j.jar"/>
<include name="xmlsec.jar"/>
- <exclude name="jbossws14-client.jar"/>
<exclude name="jbossws-client.jar"/>
</fileset>
</unjar>
Modified: branches/Branch_4_2/j2ee/build.xml
===================================================================
--- branches/Branch_4_2/j2ee/build.xml 2006-12-23 20:55:13 UTC (rev 59216)
+++ branches/Branch_4_2/j2ee/build.xml 2006-12-23 20:56:17 UTC (rev 59217)
@@ -77,7 +77,7 @@
<path refid="sun.jaf.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="apache.xerces.classpath"/>
- <path refid="jboss.jbossws14.classpath"/>
+ <path refid="jboss.jbossws.classpath"/>
</path>
<!-- ======= -->
Modified: branches/Branch_4_2/server/build.xml
===================================================================
--- branches/Branch_4_2/server/build.xml 2006-12-23 20:55:13 UTC (rev 59216)
+++ branches/Branch_4_2/server/build.xml 2006-12-23 20:56:17 UTC (rev 59217)
@@ -81,7 +81,7 @@
<path refid="gjt.jpl-util.classpath"/>
<path refid="gnu.getopt.classpath"/>
<path refid="ibm.wsdl4j.classpath"/>
- <path refid="jboss.jbossws14.classpath"/>
+ <path refid="jboss.jbossws.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="oswego.concurrent.classpath"/>
Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml 2006-12-23 20:55:13 UTC (rev 59216)
+++ branches/Branch_4_2/testsuite/build.xml 2006-12-23 20:56:17 UTC (rev 59217)
@@ -104,6 +104,7 @@
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.jbossretro.rt.classpath"/>
<path refid="jboss.backport.concurrent.classpath"/>
+ <path refid="jboss.jbossws.classpath"/>
<path refid="jgroups.jgroups.classpath"/>
<path refid="joesnmp.joesnmp.classpath"/>
<path refid="junit.junit.classpath"/>
@@ -202,39 +203,6 @@
<property name="release.id" value="${install.id}"/>
<property name="install.root" value="${module.output}/${install.id}"/>
- <!-- Set classpath for the webservice stack depending on ${jboss.dist.name} and client jar -->
- <property name="jboss.dist.name" value="jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
- <property name="jboss.home" value="${module.root}/../build/output/${jboss.dist.name}"/>
- <available property="jboss-ws4ee.available" file="${jboss.home}/client/jboss-ws4ee-client.jar"/>
- <condition property="webservice.classpath" value="jboss-ws4ee.classpath">
- <isset property="jboss-ws4ee.available"/>
- </condition>
- <condition property="webservice.classpath" value="jbossws14.classpath">
- <not>
- <isset property="HAVE_JDK_1.5"/>
- </not>
- </condition>
- <condition property="webservice.classpath" value="jbossws.classpath">
- <isset property="HAVE_JDK_1.5"/>
- </condition>
- <path id="jboss-ws4ee.classpath">
- <pathelement path="${jboss/jboss.ws4ee.lib}/jboss-ws4ee-client.jar"/>
- <pathelement path="${jboss/jboss.ws4ee.lib}/axis-ws4ee.jar"/>
- <pathelement path="${jboss.jbossws14.lib}/jboss-jaxrpc.jar"/>
- <pathelement path="${jboss.jbossws14.lib}/jboss-saaj.jar"/>
- </path>
- <path id="jbossws14.classpath">
- <pathelement path="${jboss.jbossws14.lib}/jbossws14-client.jar"/>
- <pathelement path="${jboss.jbossws14.lib}/jboss-jaxrpc.jar"/>
- <pathelement path="${jboss.jbossws14.lib}/jboss-saaj.jar"/>
- </path>
- <path id="jbossws.classpath">
- <pathelement path="${jboss.jbossws.lib}/jbossws-client.jar"/>
- <pathelement path="${jboss.jbossws14.lib}/jboss-jaxrpc.jar"/>
- <pathelement path="${jboss.jbossws14.lib}/jboss-saaj.jar"/>
- </path>
- <path id="webservice.classpath" refid="${webservice.classpath}"/>
-
<!-- classpath and local.classpath must have a value using with a path -->
<property name="classpath" value=""/>
<property name="local.classpath" value=""/>
@@ -243,7 +211,6 @@
<path id="thirdparty.classpath">
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
- <path refid="webservice.classpath"/>
</path>
<!-- Classpath to build and run the tests -->
@@ -1638,7 +1605,7 @@
<include name="deploy/hsqldb-ds.xml"/>
<include name="deploy/jbossweb*.sar/**"/>
<include name="deploy/jbossws.sar/**"/>
- <include name="deploy/jbossws14.sar/**"/>
+ <include name="deploy/jbossws.sar/**"/>
<include name="deploy/client-deployer-service.xml"/>
<include name="deploy/ear-deployer.xml"/>
<include name="deploy/ejb-deployer.xml"/>
@@ -1681,7 +1648,7 @@
<include name="deploy/hsqldb-ds.xml"/>
<include name="deploy/jbossweb*.sar/**"/>
<include name="deploy/jbossws.sar/**"/>
- <include name="deploy/jbossws14.sar/**"/>
+ <include name="deploy/jbossws.sar/**"/>
<include name="deploy/client-deployer-service.xml"/>
<include name="deploy/ear-deployer.xml"/>
<include name="deploy/ejb-deployer.xml"/>
@@ -1744,7 +1711,7 @@
<include name="deploy/hsqldb-ds.xml"/>
<include name="deploy/jbossweb*.sar/**"/>
<include name="deploy/jbossws.sar/**"/>
- <include name="deploy/jbossws14.sar/**"/>
+ <include name="deploy/jbossws.sar/**"/>
<include name="deploy/client-deployer-service.xml"/>
<include name="deploy/ear-deployer.xml"/>
<include name="deploy/ejb-deployer.xml"/>
@@ -1824,7 +1791,6 @@
<include name="deploy/hsqldb-ds.xml"/>
<include name="deploy/jbossweb*.sar/**"/>
<include name="deploy/jbossws.sar/**"/>
- <include name="deploy/jbossws14.sar/**"/>
<include name="deploy/client-deployer-service.xml"/>
<include name="deploy/ear-deployer.xml"/>
<include name="deploy/ejb-deployer.xml"/>
Modified: branches/Branch_4_2/varia/build.xml
===================================================================
--- branches/Branch_4_2/varia/build.xml 2006-12-23 20:55:13 UTC (rev 59216)
+++ branches/Branch_4_2/varia/build.xml 2006-12-23 20:56:17 UTC (rev 59217)
@@ -83,7 +83,7 @@
<path refid="beanshell.beanshell.classpath"/>
<path refid="hsqldb.hsqldb.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
- <path refid="jboss.jbossws14.classpath"/>
+ <path refid="jboss.jbossws.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="juddi.juddi.classpath"/>
<path refid="junit.junit.classpath"/>
More information about the jboss-cvs-commits
mailing list