[jboss-cvs] JBossAS SVN: r60531 - in branches/Branch_4_2: testsuite and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 14 07:19:47 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-14 07:19:46 -0500 (Wed, 14 Feb 2007)
New Revision: 60531
Removed:
branches/Branch_4_2/varia/src/main/org/jboss/jaxr/
branches/Branch_4_2/varia/src/resources/juddi/
Modified:
branches/Branch_4_2/build/build-distr.xml
branches/Branch_4_2/build/build-thirdparty.xml
branches/Branch_4_2/testsuite/build.xml
branches/Branch_4_2/varia/build.xml
Log:
Externalize jaxr. Use jaxr-1.2.0.GA
Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml 2007-02-14 11:55:48 UTC (rev 60530)
+++ branches/Branch_4_2/build/build-distr.xml 2007-02-14 12:19:46 UTC (rev 60531)
@@ -740,7 +740,6 @@
<fileset dir="${_module.output}/lib">
<include name="jbossjmx-ant.jar"/>
<include name="jboss-srp-client.jar"/>
- <include name="juddisaaj.jar"/>
</fileset>
</copy>
@@ -788,27 +787,9 @@
<!-- Include the juddi sar unpacked -->
<mkdir dir="${install.server}/all/deploy/juddi-service.sar"/>
- <delete dir="${install.server}/all/deploy/juddi-service.sar/juddi.war" quiet="true" />
- <unjar src="${_module.output}/lib/juddi-service.sar"
+ <unjar src="${jboss.jaxr.lib}/juddi-service.sar"
dest="${install.server}/all/deploy/juddi-service.sar" />
-
- <mkdir dir="${install.server}/all/deploy/juddi-service.sar/juddiws.war"/>
- <unjar src="${_module.output}/lib/juddiws.war"
- dest="${install.server}/all/deploy/juddi-service.sar/juddiws.war"/>
-
- <copy todir="${install.server}/all/deploy/juddi-service.sar" filtering="no">
- <fileset dir="${apache.scout.lib}">
- <include name="scout.jar"/>
- </fileset>
- <fileset dir="${_module.output}/lib">
- <include name="juddisaaj.jar"/>
- </fileset>
- <fileset dir="${juddi.juddi.lib}">
- <include name="juddi.jar"/>
- </fileset>
- </copy>
-
<!-- Include the HTTP invoker service unpacked -->
<mkdir dir="${install.server}/all/deploy/httpha-invoker.sar"/>
<unjar src="${_module.output}/lib/httpha-invoker.sar"
Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml 2007-02-14 11:55:48 UTC (rev 60530)
+++ branches/Branch_4_2/build/build-thirdparty.xml 2007-02-14 12:19:46 UTC (rev 60531)
@@ -87,6 +87,7 @@
<componentref name="jboss/cache" version="1.4.1.SP1"/>
<componentref name="jboss/common" version="1.0.4.GA"/>
<componentref name="jboss/dom4j-jarjar" version="1.6.1"/>
+ <componentref name="jboss/jaxr" version="1.2.0.GA"/>
<componentref name="jboss/jbossretro-rt" version="1.0.4.GA"/>
<componentref name="jboss/jbossts14" version="snapshot"/>
<componentref name="jboss/jbossws" version="1.2.0.CR2"/>
Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml 2007-02-14 11:55:48 UTC (rev 60530)
+++ branches/Branch_4_2/testsuite/build.xml 2007-02-14 12:19:46 UTC (rev 60531)
@@ -107,6 +107,7 @@
<path refid="jacorb.jacorb.classpath"/>
<path refid="javassist.classpath"/>
<path refid="jboss.backport.concurrent.classpath"/>
+ <path refid="jboss.jaxr.classpath"/>
<path refid="jboss.jbossretro.rt.classpath"/>
<path refid="jboss.jbossws.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
@@ -2471,9 +2472,9 @@
</classpath>
<formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
-
<fileset dir="${build.classes}">
<patternset refid="jaxr.includes"/>
</fileset>
Modified: branches/Branch_4_2/varia/build.xml
===================================================================
--- branches/Branch_4_2/varia/build.xml 2007-02-14 11:55:48 UTC (rev 60530)
+++ branches/Branch_4_2/varia/build.xml 2007-02-14 12:19:46 UTC (rev 60531)
@@ -77,7 +77,6 @@
<path refid="apache.ant.classpath"/>
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
- <path refid="apache.scout.classpath"/>
<path refid="apache.bsf.classpath"/>
<path refid="apache.velocity.classpath"/>
<path refid="beanshell.beanshell.classpath"/>
@@ -85,7 +84,6 @@
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.jbossws.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
- <path refid="juddi.juddi.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="opennms.joesnmp.classpath"/>
<path refid="oswego.concurrent.classpath"/>
@@ -536,51 +534,6 @@
</fileset>
</jar>
- <!--juddi jar-->
- <jar jarfile="${build.lib}/juddi-service.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/jaxr/juddi/**"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/juddisaaj.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/jaxr/juddi/transport/**"/>
- </fileset>
- </jar>
-
- <!--juddiws.war -->
- <war warfile="${build.lib}/juddiws.war"
- webxml="${build.resources}/juddi/jse/web.xml"
- manifest="${build.etc}/default.mf">
- <webinf dir="${build.resources}/juddi/jse">
- <include name="juddi*"/>
- <include name="jboss-web.xml"/>
- <exclude name="web.xml"/>
- </webinf>
- <classes dir="${build.classes}">
- <include name="org/jboss/jaxr/juddi/JUDDIServlet.*"/>
- </classes>
- <lib dir="${juddi.juddi.lib}">
- <include name="juddi.jar"/>
- </lib>
- </war>
-
- <!--juddi-service.sar-->
- <jar jarfile="${build.lib}/juddi-service.sar"
- manifest="${build.etc}/default.mf">
- <metainf dir="${build.resources}/juddi">
- <include name="*.xml"/>
- <include name="ddl/*.ddl"/>
- </metainf>
-
- <fileset dir="${build.lib}">
- <include name="juddi-service.jar"/>
- </fileset>
- </jar>
-
<!-- Generate the (.deployer) to be used for bean deployment -->
<jar jarfile="${build.lib}/jboss-bean-deployer.jar"
manifest="${build.etc}/default.mf">
More information about the jboss-cvs-commits
mailing list