[jboss-cvs] JBossAS SVN: r60532 - in trunk: testsuite and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 14 07:56:46 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-14 07:56:46 -0500 (Wed, 14 Feb 2007)
New Revision: 60532
Removed:
trunk/varia/src/main/org/jboss/jaxr/
trunk/varia/src/resources/juddi/
Modified:
trunk/build/build-distr.xml
trunk/build/build-thirdparty.xml
trunk/testsuite/build.xml
trunk/varia/build.xml
Log:
Install jboss-jaxr-1.2.0.GA
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2007-02-14 12:19:46 UTC (rev 60531)
+++ trunk/build/build-distr.xml 2007-02-14 12:56:46 UTC (rev 60532)
@@ -1048,7 +1048,6 @@
<fileset dir="${_module.output}/lib">
<include name="jbossjmx-ant.jar"/>
<include name="jboss-srp-client.jar"/>
- <include name="juddisaaj.jar"/>
</fileset>
</copy>
@@ -1094,31 +1093,10 @@
<!-- 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" 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>
-
+ <unjar src="${jboss.jaxr.lib}/juddi-service.sar"
+ dest="${install.server}/all/deploy/juddi-service.sar" />
+
<copy todir="${install.server}/all/lib" filtering="no">
- <fileset dir="${apache.scout.lib}">
- <include name="scout.jar"/>
- </fileset>
- </copy>
-
- <copy todir="${install.server}/all/lib" filtering="no">
<fileset dir="${wutka.dtdparser.lib}">
<include name="dtdparser121.jar"/>
</fileset>
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2007-02-14 12:19:46 UTC (rev 60531)
+++ trunk/build/build-thirdparty.xml 2007-02-14 12:56:46 UTC (rev 60532)
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
-<!-- $Id$ -->
+
+<!-- $Id: $ -->
+
<project name="main.build"
default="synchronize"
basedir=".">
@@ -90,6 +92,7 @@
<componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>
<componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
<componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
+ <componentref name="jboss/jaxr" version="1.2.0.GA"/>
<componentref name="jboss/jbossxb" version="snapshot"/>
<componentref name="jboss/jbossws" version="snapshot"/>
<componentref name="jboss/jbossws-sun-wsimport" version="2.0.0"/>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2007-02-14 12:19:46 UTC (rev 60531)
+++ trunk/testsuite/build.xml 2007-02-14 12:56:46 UTC (rev 60532)
@@ -120,6 +120,7 @@
<path refid="trove.classpath"/>
<path refid="wutka.dtdparser.classpath"/>
<path refid="woodstox.woodstox.classpath"/>
+ <path refid="jboss.jaxr.classpath"/>
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.serialization.classpath"/>
<path refid="jboss.jbossws.classpath"/>
@@ -149,6 +150,7 @@
<!-- Modules -->
&modules;
+
<!-- ======= -->
<!-- InternalServer -->
<!-- This could be a mistake. Perhaps, though, it would be a good idea to separate
@@ -3087,6 +3089,7 @@
</classpath>
<formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml 2007-02-14 12:19:46 UTC (rev 60531)
+++ trunk/varia/build.xml 2007-02-14 12:56:46 UTC (rev 60532)
@@ -72,6 +72,7 @@
<!-- ========= -->
&libraries;
+
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="sun.jaf.classpath"/>
@@ -80,7 +81,6 @@
<path refid="apache.bsf.classpath"/>
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
- <path refid="apache.scout.classpath"/>
<path refid="apache.xerces.classpath"/>
<path refid="apache.velocity.classpath"/>
<path refid="junit.junit.classpath"/>
@@ -542,51 +542,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/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