[gatein-commits] gatein SVN: r8393 - in epp/portal/branches/EPP_5_2_Branch/distribution: jboss-epp/src and 1 other directory.

[do-not-reply at jboss.org]

Author: hfnukal
Date: 2012-02-03 09:54:38 -0500 (Fri, 03 Feb 2012)
New Revision: 8393

Modified:
   epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml
   epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
Log:
JBEPP-1499 Upgrade EAP to 5.1.2

Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml	2012-02-03 14:54:06 UTC (rev 8392)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml	2012-02-03 14:54:38 UTC (rev 8393)
@@ -78,7 +78,7 @@
         </zip>
     </target>
 
-    <target name="finalTasks" depends="modifyStartupMessage,http-ivoker-PATCH,jbossws-native-PATCH">
+    <target name="finalTasks" depends="modifyStartupMessage,jbossws-native-PATCH">
     </target>
     <!-- Patching startup message in log when starting portal -->
     <target name="modifyStartupMessage">
@@ -117,24 +117,6 @@
         </zip>
     </target>
 
-    <target name="http-ivoker-PATCH">
-        <echo>Patching EAP http-ivoker.sar/invoker.war/web.xml ...</echo>
-        <patch
-            originalfile="${epp.path}/jboss-as/server/production/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml"
-            patchfile="src/patch/EAP/http-invoker.sar.invoker.war.web.xml.patch"
-            failonerror="true"
-        />
-        <patch
-            originalfile="${epp.path}/jboss-as/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml"
-            patchfile="src/patch/EAP/http-invoker.sar.invoker.war.web.xml.patch"
-            failonerror="true"
-        />
-        <patch
-            originalfile="${epp.path}/jboss-as/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF/web.xml"
-            patchfile="src/patch/EAP/http-invoker.sar.invoker.war.web.xml.patch"
-            failonerror="true"
-        />
-    </target>
     <target name="jbossws-native-PATCH">
         <echo>One-off patch for JBPAPP-7108</echo>
         <property name="resource_jar" value="${basedir}/src/main/resources/eap/jbossws-native-PATCH/jbossws-common-1.1.0.SP7-patch-02.jar" />

Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml	2012-02-03 14:54:06 UTC (rev 8392)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml	2012-02-03 14:54:38 UTC (rev 8393)
@@ -13,7 +13,7 @@
     <name>Distribution</name>
     
     <properties>
-        <eap.version>5.1.1</eap.version>
+        <eap.version>5.1.2</eap.version>
         <eap.groupId>org.jboss.jbossas</eap.groupId>
         <eap.dir>jboss-eap-5.1</eap.dir>
         <epp.dir>jboss-epp-5.2</epp.dir>