[Mulgara-svn] r1673 - trunk

[pag at mulgara.org]

Author: pag
Date: 2009-04-20 21:58:08 -0700 (Mon, 20 Apr 2009)
New Revision: 1673

Modified:
   trunk/build.properties
   trunk/build.xml
Log:
Added a stripped down WAR for dealing with classpath conflicts

Modified: trunk/build.properties
===================================================================
--- trunk/build.properties	2009-04-18 22:49:44 UTC (rev 1672)
+++ trunk/build.properties	2009-04-21 04:58:08 UTC (rev 1673)
@@ -62,6 +62,7 @@
 
 # Web UI
 mulgara.war               = mulgara-${mulgara-version}.war
+mulgara-core.war          = mulgara-core-${mulgara-version}.war
 
 # Stripped down distribution for inclusion in a WAR
 mulgara-servlet.jar  = mulgara-servlet-${mulgara-version}.jar

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2009-04-18 22:49:44 UTC (rev 1672)
+++ trunk/build.xml	2009-04-21 04:58:08 UTC (rev 1673)
@@ -325,6 +325,7 @@
           description="Creates the distribution files">
 
     <copy file="${bin.dir}/${mulgara.war}" tofile="${dist.dir}/${mulgara.war}"/>
+    <copy file="${bin.dir}/${mulgara-core.war}" tofile="${dist.dir}/${mulgara-core.war}"/>
   </target>
 
   <!-- =================================================================== -->
@@ -1422,6 +1423,24 @@
       <lib dir="${bin.dir}" includes="${mulgara-servlet.jar}"/>
       <lib dir="${dist.dir}" includes="expires.txt"/>
     </war>
+
+    <war warfile="${bin.dir}/${mulgara-core.war}"
+        webxml="${obj.dir}/war/mulgara/WEB-INF/web.xml">
+
+      <zipfileset dir="${conf.dir}" prefix="WEB-INF/conf"
+          includes="mulgara-config-war.xml, mulgara-rmi.policy, mulgara.policy,
+          log4j-mulgara-war.properties, expires.txt"/>
+
+      <fileset dir="${src.dir}/war/mulgara"
+          includes="WEB-INF/**" excludes="WEB-INF/web.xml"/>
+
+      <fileset dir="${src.dir}/war/mulgara" includes="index.html"/>
+
+      <fileset dir="${obj.dir}/war/mulgara" includes="webui/images/,webui/styles/"/>
+
+      <lib dir="${bin.dir}" includes="${mulgara-core.jar}"/>
+      <lib dir="${dist.dir}" includes="expires.txt"/>
+    </war>
   </target>
 
   <target name="mulgara.war-uptodate">