LEP-3515 Group geronimo fix with other app server fixes that are similar

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@8504 05bdf26c-840f-0410-9ced-eb539d925f36

build-common-web.xml

@@ -121,15 +121,6 @@
 			</else>
 		</if>
 
-		<if>
-			<equals arg1="${app.server.type}" arg2="geronimo-tomcat" />
-			<then>
-				<copy todir="${war.file.dest}/WEB-INF/lib">
-					<fileset dir="${project.dir}/lib/development" includes="mail.jar,smtp.jar"/>
-				</copy>
-			</then>
-		</if>
-
 		<if>
 			<and>
 				<or>

build.xml

@@ -395,6 +395,18 @@
 			<fileset dir="lib/portal" />
 		</copy>
 
+		<if>
+			<equals arg1="${app.server.type}" arg2="geronimo-tomcat" />
+			<then>
+				<copy todir="${app.server.lib.portal.dir}">
+					<fileset
+						dir="lib/development"
+						includes="mail.jar,smtp.jar"
+					/>
+				</copy>
+			</then>
+		</if>
+
 		<if>
 			<or>
 				<equals arg1="${app.server.type}" arg2="jboss-jetty" />

tools/ext_tmpl/build-common.xml

@@ -145,15 +145,6 @@
 				<unwar src="${war.file}.war" dest="${war.file.dest}" />
 			</else>
 		</if>
-
-		<if>
-			<equals arg1="${app.server.type}" arg2="geronimo-tomcat" />
-			<then>
-				<copy todir="${war.file.dest}/WEB-INF/lib">
-					<fileset dir="${project.dir}/lib/development" includes="mail.jar,smtp.jar"/>
-				</copy>
-			</then>
-		</if>
 
 		<if>
 			<and>

tools/ext_tmpl/build-parent.xml

@@ -187,6 +187,17 @@
 			<fileset dir="lib/portal" />
 		</copy>
 
+		<if>
+			<equals arg1="${app.server.type}" arg2="geronimo-tomcat" />
+			<then>
+				<copy todir="${app.server.lib.portal.dir}">
+					<fileset
+						dir="lib/development"
+						includes="mail.jar,smtp.jar"
+					/>
+				</copy>
+			</then>
+		</if>
 
 		<if>
 			<or>