[jboss-cvs] JBoss Messaging SVN: r2794 - in trunk: lib and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jun 22 15:29:54 EDT 2007


Author: clebert.suconic at jboss.com
Date: 2007-06-22 15:29:54 -0400 (Fri, 22 Jun 2007)
New Revision: 2794

Removed:
   trunk/lib/README.txt
   trunk/lib/jboss-j2ee.jar
   trunk/lib/jboss-j2se.jar
   trunk/lib/jboss-jmx.jar
   trunk/lib/jboss-system.jar
   trunk/lib/jboss-transaction.jar
   trunk/lib/jboss.jar
   trunk/lib/jbosssx.jar
   trunk/lib/jnp-client.jar
Modified:
   trunk/build-messaging.xml
   trunk/build-thirdparty.xml
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-986 - Getting rid of jboss libraries / Updating JBoss Libraries to JBAS 4.2

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2007-06-20 12:36:38 UTC (rev 2793)
+++ trunk/build-messaging.xml	2007-06-22 19:29:54 UTC (rev 2794)
@@ -160,26 +160,11 @@
       <path refid="jboss.aop.classpath"/>
       <path refid="jboss.remoting.classpath"/>
       <path refid="jboss.jbossts14.classpath"/>
+      <path refid="jbossas.core.libs.classpath"/>
+      <!-- some components at JBoss use JBossSerialization (JCA for instance) -->
+      <path refid="jboss.serialization.classpath"/>
    </path>
 
-   <property name="jboss.j2ee.lib" value="${project.root}/lib/"/>
-   <path id="jboss.j2ee.classpath">
-      <pathelement location="${project.root}/lib/jboss-j2ee.jar"/>
-   </path>
-
-   <property name="jboss.j2se.lib" value="${project.root}/lib/"/>
-   <path id="jboss.j2se.classpath">
-      <pathelement location="${project.root}/lib/jboss-j2se.jar"/>
-   </path>   
-
-   <path id="jboss.system.classpath">
-      <pathelement location="${project.root}/lib/jboss-system.jar"/>
-   </path>
-
-   <path id="jboss.security.classpath">
-      <pathelement location="${project.root}/lib/jbosssx.jar"/>
-   </path>
-
    <path id="jboss.transaction.classpath">
       <pathelement location="${project.root}/lib/jboss-transaction.jar"/>
    </path>
@@ -203,13 +188,6 @@
    <property name="jboss.naming.lib" value="${project.root}/lib/"/>
 
    <path id="local.dependencies.classpath">
-      <path refid="jboss.j2ee.classpath"/>
-      <path refid="jboss.j2se.classpath"/>      
-      <path refid="jboss.system.classpath"/>
-      <path refid="jboss.security.classpath"/>
-      <path refid="jboss.transaction.classpath"/>
-      <path refid="jboss.jmx.classpath"/>
-      <path refid="jboss.remoting.classpath"/>
       <path refid="jboss.classpath"/>
    </path>
 
@@ -376,8 +354,8 @@
 
    </target>
 
-   <!-- Note that the sar doesn't contain jboss-messaging.jar - this is because jboss-messaging.jar actually needs
-        to go in server/<config_name>/lib directory, since other components e.g. the JTA recovery manager need to access it
+   <!-- Note that the sar doesn't contain jboss-messaging.jar - this is because jboss-messaging.jar actually needs
+        to go in server/<config_name>/lib directory, since other components e.g. the JTA recovery manager need to access it
         and won't be able to if it is in the sar -->
    <target name="sar" depends="compile, jar, sar-structure">
       <mkdir dir="${build.lib}"/>
@@ -486,7 +464,7 @@
 
    <target name="release-bundle" depends="artifacts, release-structure, examples, userdoc, bundle-source, bundle-test-results, javadoc">
 
-      <copy todir="${release.output}" file="${build.lib}/jboss-${module.name}.sar"/>
+      <copy todir="${release.output}" file="${build.lib}/jboss-${module.name}.sar"/>
       <copy todir="${release.output}" file="${build.lib}/jboss-${module.name}.jar"/>
       <copy todir="${release.output}" file="${build.lib}/jboss-${module.name}-client.jar"/>
       <copy todir="${release.output}" file="./docs/README.html"/>
@@ -555,24 +533,24 @@
                  property="functional.test.results.present" value="true"/>
       <fail message="Functional test results ${release.output}/test-results/jboss-messaging-functional-test-results-${module.version}.zip not available!"
             unless="functional.test.results.present"/>
-
+
 <!--
       <available file="${release.output}/test-results/jboss-messaging-functional-test-results-Linux-${module.version}.zip"
                  property="linux.functional.test.results.present" value="true"/>
       <fail message="Linux functional test results ${release.output}/test-results/jboss-messaging-functional-test-results-Linux-${module.version}.zip not available!"
-            unless="linux.functional.test.results.present"/>
+            unless="linux.functional.test.results.present"/>
 -->
 
       <available file="${release.output}/test-results/jboss-messaging-stress-test-results-${module.version}.zip"
                  property="stress.test.results.present" value="true"/>
       <fail message="Stress test results ${release.output}/test-results/jboss-messaging-stress-test-results-${module.version}.zip not available!"
             unless="stress.test.results.present"/>
-
+
 <!--
       <available file="${release.output}/test-results/jboss-messaging-stress-test-results-Linux-${module.version}.zip"
                  property="linux.stress.test.results.present" value="true"/>
       <fail message="Linux stress test results ${release.output}/test-results/jboss-messaging-stress-test-results-Linux-${module.version}.zip not available!"
-            unless="linux.stress.test.results.present"/>
+            unless="linux.stress.test.results.present"/>
 -->
 
    </target>
@@ -631,8 +609,8 @@
       <ant dir="./docs/examples/distributed-queue" antfile="build.xml" inheritAll="false" target="clean"/>
       <ant dir="./docs/examples/distributed-topic" antfile="build.xml" inheritAll="false" target="clean"/>
       <ant dir="./docs/examples/queue-failover" antfile="build.xml" inheritAll="false" target="clean"/>
-      <ant dir="./docs/examples/http" antfile="build.xml" inheritAll="false" target="clean"/>
-      <ant dir="./docs/examples/web-service" antfile="build.xml" inheritAll="false" target="clean"/>
+      <ant dir="./docs/examples/http" antfile="build.xml" inheritAll="false" target="clean"/>
+      <ant dir="./docs/examples/web-service" antfile="build.xml" inheritAll="false" target="clean"/>
       <ant dir="./docs/examples/stateless-clustered" antfile="build.xml" inheritAll="false" target="clean"/>
       <ant dir="./tests" antfile="build.xml" inheritAll="false" target="clean"/>
    </target>

Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml	2007-06-20 12:36:38 UTC (rev 2793)
+++ trunk/build-thirdparty.xml	2007-06-22 19:29:54 UTC (rev 2794)
@@ -91,7 +91,10 @@
       <componentref name="jboss/aop" version="1.5.5.GA"/>
       <componentref name="jboss/remoting" version="2.2.0.SP4"/>
       <componentref name="jboss/jbossts14" version="4.2.3.SP3"/>
+      <componentref name="jboss/jbossts14" version="4.2.3.SP3"/>
+      <componentref name="jbossas/core-libs" version="4.2.0.GA"/>
 
+
       <!--
           Totally unapropriate here, but this is what we need to do for the time being if we
           want HTTP.

Deleted: trunk/lib/README.txt
===================================================================
--- trunk/lib/README.txt	2007-06-20 12:36:38 UTC (rev 2793)
+++ trunk/lib/README.txt	2007-06-22 19:29:54 UTC (rev 2794)
@@ -1 +0,0 @@
-jbosssx.jar	4.0.5.GA

Deleted: trunk/lib/jboss-j2ee.jar
===================================================================
(Binary files differ)

Deleted: trunk/lib/jboss-j2se.jar
===================================================================
(Binary files differ)

Deleted: trunk/lib/jboss-jmx.jar
===================================================================
(Binary files differ)

Deleted: trunk/lib/jboss-system.jar
===================================================================
(Binary files differ)

Deleted: trunk/lib/jboss-transaction.jar
===================================================================
(Binary files differ)

Deleted: trunk/lib/jboss.jar
===================================================================
(Binary files differ)

Deleted: trunk/lib/jbosssx.jar
===================================================================
(Binary files differ)

Deleted: trunk/lib/jnp-client.jar
===================================================================
(Binary files differ)




More information about the jboss-cvs-commits mailing list