[jboss-cvs] JBossAS SVN: r58432 - trunk/tomcat

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

Author: scott.stark at jboss.org
Date: 2006-11-15 22:54:33 -0500 (Wed, 15 Nov 2006)
New Revision: 58432

Modified:
   trunk/tomcat/build.xml
Log:
Drop the tomcat6 suffix from the artifact names

Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml	2006-11-16 03:54:05 UTC (rev 58431)
+++ trunk/tomcat/build.xml	2006-11-16 03:54:33 UTC (rev 58432)
@@ -42,8 +42,8 @@
   <target name="configure" unless="configure.disable">
 
     <!-- Module name(s) & version -->
-    <property name="module.name" value="tomcat4"/>
-    <property name="module.Name" value="JBoss Tomcat6 Plugin"/>
+    <property name="module.name" value="tomcat"/>
+    <property name="module.Name" value="JBossWeb Plugin"/>
     <property file="module.version"/>
 
     &libraries;
@@ -216,10 +216,10 @@
     <call target="compile"/>
 
     <mkdir dir="${build.lib}"/>
-    <mkdir dir="${build.deploy}/jbossweb-tomcat6.deployer/META-INF"/>
+    <mkdir dir="${build.deploy}/jbossweb.deployer/META-INF"/>
 
-    <!-- Build the jbossweb-tomcat6.deployer -->
-  	 <copy todir="${build.deploy}/jbossweb-tomcat6.deployer/META-INF">
+    <!-- Build the jbossweb.deployer -->
+  	 <copy todir="${build.deploy}/jbossweb.deployer/META-INF">
   	 	<fileset dir="${build.resources}">
   	 		<include name="jboss-structure.xml" />
   	 		<include name="war-deployers-beans.xml" />
@@ -227,36 +227,36 @@
   	 	</fileset>
   	 </copy>	
     <copy file="${build.resources}/context.xml"
-      todir="${build.deploy}/jbossweb-tomcat6.deployer"/>
+      todir="${build.deploy}/jbossweb.deployer"/>
     <copy file="${build.resources}/web.xml"
-      tofile="${build.deploy}/jbossweb-tomcat6.deployer/conf/web.xml"/>
+      tofile="${build.deploy}/jbossweb.deployer/conf/web.xml"/>
     <copy file="${build.resources}/server.xml"
-      tofile="${build.deploy}/jbossweb-tomcat6.deployer/server.xml"/>
-    <copy todir="${build.deploy}/jbossweb-tomcat6.deployer">
+      tofile="${build.deploy}/jbossweb.deployer/server.xml"/>
+    <copy todir="${build.deploy}/jbossweb.deployer">
       <fileset dir="${jboss.web.lib}">
         <include name="*.jar"/>
       </fileset>
     </copy>
     
-    <copy todir="${build.deploy}/jbossweb-tomcat6.deployer"
+    <copy todir="${build.deploy}/jbossweb.deployer"
        file="${sun.jstl.lib}/jstl.jar" />        
 
-    <mkdir dir="${build.deploy}/jbossweb-tomcat6.deployer/jsf-libs"/>
+    <mkdir dir="${build.deploy}/jbossweb.deployer/jsf-libs"/>
    
-    <copy todir="${build.deploy}/jbossweb-tomcat6.deployer/jsf-libs">        
+    <copy todir="${build.deploy}/jbossweb.deployer/jsf-libs">        
        <fileset dir="${sun.jsf.lib}">           
           <include name="*.jar" />
        </fileset>
     </copy>
 
     <!-- jar for jsf integration classes -->
-    <jar jarfile="${build.deploy}/jbossweb-tomcat6.deployer/jsf-libs/jboss-faces.jar">
+    <jar jarfile="${build.deploy}/jbossweb.deployer/jsf-libs/jboss-faces.jar">
       <fileset dir="${build.classes}">
          <include name="org/jboss/web/jsf/integration/**"/>
       </fileset>
     </jar>
 
-    <jar jarfile="${build.deploy}/jbossweb-tomcat6.deployer/tomcat6-service.jar"
+    <jar jarfile="${build.deploy}/jbossweb.deployer/jbossweb-service.jar"
       manifest="${build.etc}/default.mf">
       <!-- The service classes -->
       <fileset dir="${build.classes}">
@@ -289,7 +289,7 @@
      </jar>
      
     <!-- jboss-web-metamodel.jar -->
-    <jar jarfile="${build.deploy}/jbossweb-tomcat6.deployer/jboss-web-metamodel.jar">
+    <jar jarfile="${build.deploy}/jbossweb.deployer/jboss-web-metamodel.jar">
       <fileset dir="${build.classes}">
         <include name="org/jboss/web/metamodel/**"/>
       </fileset>