[jboss-cvs] JBossAS SVN: r74001 - in trunk: varia and 2 other directories.

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

Author: dimitris at jboss.org
Date: 2008-06-03 10:34:03 -0400 (Tue, 03 Jun 2008)
New Revision: 74001

Removed:
   trunk/varia/src/main/org/jboss/mq/
   trunk/varia/src/resources/jbossmq/
Modified:
   trunk/build/build-distr.xml
   trunk/build/build.xml
   trunk/varia/build.xml
Log:
JBAS-5562, Remove jbossmq-httpil.sar from deploy-hasingleton

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-06-03 14:30:32 UTC (rev 74000)
+++ trunk/build/build-distr.xml	2008-06-03 14:34:03 UTC (rev 74001)
@@ -980,8 +980,6 @@
       </fileset>
     </copy>
 
-    <!-- Default server config -->
-
     <!-- Copy the deployables -->
     <mkdir dir="${install.server}/all/deploy/cluster"/>
     <copy todir="${install.server}/all/deploy/cluster" filtering="no">
@@ -1004,6 +1002,7 @@
         <include name="**/*"/>
       </fileset>
     </copy>
+    <mkdir dir="${install.server}/all/deploy-hasingleton"/>
     <mkdir dir="${install.server}/all/deploy/deploy.last"/>
     <!--
     <copy todir="${install.server}/all/deploy/deploy.last" filtering="no">
@@ -1190,15 +1189,6 @@
       </fileset>
     </copy>
 
-    <!-- Include the HTTP invoker service unpacked -->
-    <delete dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>
-    <mkdir dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>
-    <unjar src="${_module.output}/lib/jbossmq-httpil.sar" dest="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>
-    <move file="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/jbossmq-httpil.war" tofile="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/tmp.war"/>
-    <mkdir dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/jbossmq-httpil.war"/>
-    <unjar src="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/tmp.war" dest="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/jbossmq-httpil.war"/>
-    <delete file="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/tmp.war"/>
-
     <!-- copy the jboss-monitoring JAR -->
     <copy file="${project.root}/varia/output/lib/jboss-monitoring.jar" todir="${install.server}/all/lib"/>
 

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2008-06-03 14:30:32 UTC (rev 74000)
+++ trunk/build/build.xml	2008-06-03 14:34:03 UTC (rev 74001)
@@ -729,22 +729,7 @@
     </copy>
     <copy todir="${install.default.conf}"
           file="${project.root}/server/output/etc/conf/default/jndi.properties" overwrite="true"/>
-<!--
-    <copy todir="${install.default.deploy}">
-      <fileset dir="${install.all.deploy.hasingleton}">
-        <include name="jms/**"/>
--->
-        <!-- Trim the default config jms layer to only the JVM/UIL2 invoker -->
-<!--       
-        <exclude name="jms/jbossmq-hail.sar/**"/>
-      </fileset>
-    </copy>
-    <copy todir="${install.default.deploy}/jms">
-      <fileset dir="${install.examples.jca}">
-         <include name="jms-ds.xml"/>
-      </fileset>
-    </copy>
---> 
+ 
     <unjar src="${project.root}/varia/output/lib/http-invoker.sar"
       dest="${install.default}/deploy/http-invoker.sar"/>
 

Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml	2008-06-03 14:30:32 UTC (rev 74000)
+++ trunk/varia/build.xml	2008-06-03 14:34:03 UTC (rev 74001)
@@ -124,7 +124,6 @@
       <path refid="jboss.jnpserver.classpath"/>
       <path refid="jboss.server.classpath"/>
       <path refid="jboss.jbosssx.classpath"/>
-      <path refid="jboss.mq.classpath"/>
     </path>
 
     <!-- ===== -->
@@ -217,7 +216,6 @@
       <exclude name="org/jboss/varia/stats/DataSource*.java"/>
       <exclude name="org/jboss/tm/plugins/tyrex/*.java"/>
       <exclude name="org/jboss/jdo/castor/*.java"/>
-      <!--<exclude name="org/jboss/mq/il/http/servlet/HTTPServerILServlet.java"/> -->
     </javac>
   </target>
 
@@ -538,25 +536,6 @@
     </jar>
     -->
 
-    <!-- jbossmq-httpil.sar + war -->
-    <war warfile="${build.lib}/jbossmq-httpil.war"
-      webxml="${source.resources}/jbossmq/httpil/web.xml">
-      <webinf dir="${build.resources}/jbossmq/httpil">
-        <include name="jboss-web.xml"/>
-      </webinf>
-      <classes dir="${build.classes}">
-        <include name="org/jboss/mq/il/http/servlet/**"/>
-      </classes>
-    </war>
-    <jar jarfile="${build.lib}/jbossmq-httpil.sar">
-      <metainf dir="${build.resources}/jbossmq/httpil">
-        <include name="jboss-service.xml"/>
-      </metainf>
-      <fileset dir="${build.lib}">
-        <include name="jbossmq-httpil.war"/>
-      </fileset>
-    </jar>
-
     <!-- snmp-adaptor.sar containing snmp-adaptor.jar -->
     <jar jarfile="${build.lib}/snmp-adaptor.jar"
       manifest="${build.etc}/default.mf">