[jboss-cvs] JBossAS SVN: r68436 - in trunk: build and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: dimitris at jboss.org
Date: 2007-12-19 17:25:19 -0500 (Wed, 19 Dec 2007)
New Revision: 68436

Modified:
   trunk/aspects/.classpath
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
   trunk/ejb3/.classpath
   trunk/testsuite/build.xml
Log:
Rollback jboss-juddi upgrade

Modified: trunk/aspects/.classpath
===================================================================
--- trunk/aspects/.classpath	2007-12-19 22:03:36 UTC (rev 68435)
+++ trunk/aspects/.classpath	2007-12-19 22:25:19 UTC (rev 68436)
@@ -43,6 +43,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-managed.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-managed-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/ha/lib/jboss-ha-client.jar" sourcepath="/thirdparty/jboss/ha/lib/jboss-ha-client-sources.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-as4-deployer.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jboss4-jdk50.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-12-19 22:03:36 UTC (rev 68435)
+++ trunk/build/build-distr.xml	2007-12-19 22:25:19 UTC (rev 68436)
@@ -1151,7 +1151,7 @@
 
     <!-- Include the juddi sar unpacked -->
     <mkdir dir="${install.server}/all/deploy/juddi-service.sar"/>
-    <unjar src="${jboss.jboss.juddi.lib}/juddi-service.sar"
+    <unjar src="${jboss.jaxr.lib}/juddi-service.sar"
        dest="${install.server}/all/deploy/juddi-service.sar" />
 
     <copy todir="${install.server}/all/lib" filtering="no">

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2007-12-19 22:03:36 UTC (rev 68435)
+++ trunk/build/build-thirdparty.xml	2007-12-19 22:25:19 UTC (rev 68436)
@@ -61,6 +61,7 @@
     <componentref name="apache-log4j" version="1.2.14-brew"/>
     <componentref name="apache-logging" version="1.1.0.jboss"/>
     <componentref name="apache-myfaces" version="1.1.3"/>
+    <componentref name="apache-scout" version="0.7rc2"/>
     <componentref name="apache-slide" version="2.1-brew"/>
     <componentref name="apache-velocity" version="1.4jboss-brew"/>
     <componentref name="apache-xalan" version="2.7.0.patch01-brew"/>
@@ -90,12 +91,12 @@
     <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
     <componentref name="jboss/ha" version="1.0.0.BETA1"/>
     <componentref name="jboss/integration" version="5.0.0.Beta4"/>
+    <componentref name="jboss/jaxr" version="1.2.0.GA"/>
     <componentref name="jboss/jboss-ejb3-cache" version="0.11.1"/>
     <componentref name="jboss/jboss-ejb3-ext-api" version="0.1.2.Beta1"/>
     <componentref name="jboss/jboss-ejb3-impl" version="0.1.2.Beta1"/>
     <componentref name="jboss/jboss-jaspi-api" version="1.0-BETA1"/>
     <componentref name="jboss/jboss-javaee" version="5.0.0.Beta3Update1"/>
-    <componentref name="jboss/jboss-juddi" version="2.0.0.RC5"/>
     <componentref name="jboss/jboss-security-spi" version="2.0.2.Beta1"/>
     <componentref name="jboss/jbosssx" version="2.0.2.beta1"/>
     <componentref name="jboss/jbosssx-client" version="2.0.2.beta"/>
@@ -115,6 +116,7 @@
     <componentref name="jfreechart" version="0.9.20"/>
     <componentref name="jgroups" version="2.6.1.GA"/>
     <componentref name="joesnmp" version="0.3.4-brew"/>
+    <componentref name="juddi" version="0.9RC4-brew"/>
     <componentref name="junit" version="3.8.2-brew"/>
     <componentref name="nekohtml" version="0.9.1"/>
     <componentref name="objectweb-joramtests" version="1.5"/>

Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath	2007-12-19 22:03:36 UTC (rev 68435)
+++ trunk/ejb3/.classpath	2007-12-19 22:25:19 UTC (rev 68436)
@@ -66,6 +66,8 @@
 		</accessrules>
 	</classpathentry>
 	<classpathentry kind="lib" path="/thirdparty/jboss/ha/lib/jboss-ha-client.jar" sourcepath="/thirdparty/jboss/ha/lib/jboss-ha-client-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-cache/lib/jboss-ejb3-cache.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-cache/lib/jboss-ejb3-cache-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-impl/lib/jboss-ejb3-impl.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-impl/lib/jboss-ejb3-impl-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2007-12-19 22:03:36 UTC (rev 68435)
+++ trunk/testsuite/build.xml	2007-12-19 22:25:19 UTC (rev 68436)
@@ -123,6 +123,7 @@
       <path refid="wutka.dtdparser.classpath"/>
       <path refid="woodstox.woodstox.classpath"/>
       <path refid="jboss.ha.classpath"/>
+      <path refid="jboss.jaxr.classpath"/>
       <path refid="jboss.remoting.classpath"/>
       <path refid="jboss.serialization.classpath"/>
       <path refid="jboss.jboss.ejb3.ext.api.classpath" />