[jboss-svn-commits] JBoss Portal SVN: r5139 - trunk/core

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

Author: julien at jboss.com
Date: 2006-09-04 17:07:39 -0400 (Mon, 04 Sep 2006)
New Revision: 5139

Modified:
   trunk/core/build.xml
Log:
embed portal-cms.war in jboss-portal.sar/portal-cms.sar instead of jboss-portal.sar

Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml	2006-09-04 20:55:40 UTC (rev 5138)
+++ trunk/core/build.xml	2006-09-04 21:07:39 UTC (rev 5139)
@@ -274,10 +274,6 @@
       <copy todir="${build.resources}/jboss-portal/portal-server.war">
          <fileset dir="${build.resources}/portal-server-war"/>
       </copy>
-      <!-- portal-cms.war -->
-      <copy todir="${build.resources}/jboss-portal/portal-cms.war">
-         <fileset dir="${build.resources}/portal-cms-war"/>
-      </copy>
       <!-- portal-core.war -->
       <copy todir="${build.resources}/jboss-portal/portal-core.war">
          <fileset dir="${build.resources}/portal-core-war"/>
@@ -299,6 +295,10 @@
          <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core-1.0.jar"/>
          <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
       </copy>
+      <!-- portal-cms.war -->
+      <copy todir="${build.resources}/jboss-portal/portal-cms.sar/portal-cms.war">
+         <fileset dir="${build.resources}/portal-cms-war"/>
+      </copy>
       <!-- hibernate configuration for identity -->
       <copy todir="${build.resources}/jboss-portal/conf/hibernate/user">
          <fileset dir="${jboss.portal-identity.root}/resources/hibernate" includes="domain.hbm.xml"/>