[gatein-commits] gatein SVN: r6733 - in epp/portal/branches/EPP_5_2_Branch/distribution/pack/src: patch/EAP and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Jun 24 08:55:51 EDT 2011
Author: hfnukal
Date: 2011-06-24 08:55:50 -0400 (Fri, 24 Jun 2011)
New Revision: 6733
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/assemble.xml
epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/build.xml
epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jboss-log4j.xml.patch
epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jbossweb.deployer.web.xml.patch
epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jbossweb.sar.context.xml.patch
epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/properties-service.xml.patch
epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/run.conf.bat.patch
Log:
JBEPP-942 Patches for EPP 5.1.1.ER2
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/assemble.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/assemble.xml 2011-06-24 12:13:42 UTC (rev 6732)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/assemble.xml 2011-06-24 12:55:50 UTC (rev 6733)
@@ -91,7 +91,7 @@
<!-- EAP -->
<dependencySet>
<includes>
- <include>org.jboss:jboss-eap:zip</include>
+ <include>${eap.groupId}:jboss-eap:zip</include>
</includes>
<outputDirectory></outputDirectory>
<unpack>true</unpack>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/build.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/build.xml 2011-06-24 12:13:42 UTC (rev 6732)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/build.xml 2011-06-24 12:55:50 UTC (rev 6733)
@@ -12,11 +12,17 @@
failonerror="true"
/>
+ <!-- Setting this to false may broke build, useful for preparing patches -->
+ <property name="patch.failonerror">true</property>
+
+ <!--
+ patch jboss-as/server/${toConfiguration}/deployers/jbossweb.deployer/web.xml < src/patch/EAP/jbossweb.deployer.web.xml.patch
+ -->
<echo>Patching EAP deployers/jbossweb.deployer/web.xml configuration ...</echo>
<patch
originalfile="${epp.path}/jboss-as/server/${toConfiguration}/deployers/jbossweb.deployer/web.xml"
patchfile="src/patch/EAP/jbossweb.deployer.web.xml.patch"
- failonerror="true"
+ failonerror="${patch.failonerror}"
/>
<makeurl property="pc.jarfile.url">
<fileset dir="${epp.path}/jboss-as/server/default/deploy/gatein.ear/lib" includes="pc-portlet*"/>
@@ -33,14 +39,14 @@
<patch
originalfile="${epp.path}/jboss-as/server/${toConfiguration}/deploy/properties-service.xml"
patchfile="src/patch/EAP/properties-service.xml.patch"
- failonerror="true"
+ failonerror="${patch.failonerror}"
/>
<echo>Patching EAP jbossweb.sar/context.xml ...</echo>
<patch
originalfile="${epp.path}/jboss-as/server/${toConfiguration}/deploy/jbossweb.sar/context.xml"
patchfile="src/patch/EAP/jbossweb.sar.context.xml.patch"
- failonerror="true"
+ failonerror="${patch.failonerror}"
/>
</target>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jboss-log4j.xml.patch
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jboss-log4j.xml.patch 2011-06-24 12:13:42 UTC (rev 6732)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jboss-log4j.xml.patch 2011-06-24 12:55:50 UTC (rev 6733)
@@ -1,25 +1,25 @@
-diff -uNr --exclude .svn jboss-log4j.xml.orig jboss-log4j.xml
---- jboss-log4j.xml.orig 2010-03-30 16:51:10.000000000 +0200
-+++ jboss-log4j.xml 2010-05-10 11:03:24.000000000 +0200
-@@ -237,6 +237,21 @@
- <priority value="INFO"/>
- </category>
-
-+ <!-- Limit the JSR170 categories -->
-+ <category name="exo.jcr">
-+ <priority value="INFO"/>
-+ </category>
-+
-+ <!-- Limit the JSR-168 and JSR-286 categories -->
-+ <category name="org.exoplatform.services">
-+ <priority value="INFO"/>
-+ </category>
-+
-+ <!-- Limit verbose jgroups when running in cluster -->
-+ <category name="org.jgroups.protocols.UDP">
-+ <priority value="ERROR" />
-+ </category>
-+
- <!-- Limit the verbose facelets compiler -->
- <category name="facelets.compiler">
- <priority value="WARN"/>
+--- jboss-log4j.xml.orig 2011-06-24 10:50:16.000000000 +0200
++++ jboss-log4j.xml 2011-06-24 11:11:10.341965795 +0200
+@@ -180,7 +180,22 @@
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
++
++ <!-- Limit the JSR170 categories -->
++ <category name="exo.jcr">
++ <priority value="INFO"/>
++ </category>
++
++ <!-- Limit the JSR-168 and JSR-286 categories -->
++ <category name="org.exoplatform.services">
++ <priority value="INFO"/>
++ </category>
+
++ <!-- Limit verbose jgroups when running in cluster -->
++ <category name="org.jgroups.protocols.UDP">
++ <priority value="ERROR" />
++ </category>
++
+ <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+ <category name="jacorb">
+ <priority value="WARN"/>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jbossweb.deployer.web.xml.patch
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jbossweb.deployer.web.xml.patch 2011-06-24 12:13:42 UTC (rev 6732)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jbossweb.deployer.web.xml.patch 2011-06-24 12:55:50 UTC (rev 6733)
@@ -1,15 +1,16 @@
diff -uNr web.xml.orig web.xml
---- web.xml.orig 2009-10-20 21:29:24.000000000 +0200
-+++ web.xml 2010-03-04 10:37:20.000000000 +0100
-@@ -280,6 +280,11 @@
- <param-name>tagLibJar1</param-name>
- <param-value>jstl.jar</param-value>
- </init-param>
-+ <init-param>
-+ <description>Portlet standard tlds</description>
-+ <param-name>tagLibJar2</param-name>
-+ <param-value>${jboss.server.home.url}/deploy/gatein.ear/lib/%pc-portlet-version-jar%</param-value>
-+ </init-param>
-
-
- <load-on-startup>3</load-on-startup>
+--- web.xml.orig 2011-06-24 12:58:10.000000000 +0200
++++ web.xml 2011-06-24 13:06:59.595627467 +0200
+@@ -284,7 +284,11 @@
+ <param-name>tagLibJar1</param-name>
+ <param-value>jstl.jar</param-value>
+ </init-param>
+-
++ <init-param>
++ <description>Portlet standard tlds</description>
++ <param-name>tagLibJar2</param-name>
++ <param-value>${jboss.server.home.url}/deploy/gatein.ear/lib/%pc-portlet-version-jar%</param-value>
++ </init-param>
+
+ <load-on-startup>3</load-on-startup>
+ </servlet>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jbossweb.sar.context.xml.patch
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jbossweb.sar.context.xml.patch 2011-06-24 12:13:42 UTC (rev 6732)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jbossweb.sar.context.xml.patch 2011-06-24 12:55:50 UTC (rev 6733)
@@ -1,12 +1,11 @@
---- context.xml.orig 2010-03-30 10:51:10.000000000 +0200
-+++ context.xml 2010-04-27 13:42:27.000000000 +0200
+--- context.xml.orig 2011-06-24 13:54:02.000000000 +0200
++++ context.xml 2011-06-24 14:01:54.304475869 +0200
@@ -13,5 +13,8 @@
- role for servlet init/destroy events.
- -->
- <InstanceListener>org.jboss.web.tomcat.security.RunAsListener</InstanceListener>
--
+ role for servlet init/destroy events.
+ -->
+ <InstanceListener>org.jboss.web.tomcat.security.RunAsListener</InstanceListener>
+
+ <!-- Needed for portal session paths -->
+ <SessionCookie path="/"/>
-+
- </Context>
+
+ </Context>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/properties-service.xml.patch
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/properties-service.xml.patch 2011-06-24 12:13:42 UTC (rev 6732)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/properties-service.xml.patch 2011-06-24 12:55:50 UTC (rev 6733)
@@ -1,14 +1,14 @@
---- properties-service.xml.orig 2010-10-05 12:40:54.671128735 +0200
-+++ properties-service.xml 2010-10-05 12:41:40.823129364 +0200
-@@ -40,6 +40,11 @@
- <mbean code="org.jboss.varia.property.SystemPropertiesService"
- name="jboss:type=Service,name=SystemProperties">
-
+--- properties-service.xml.orig 2011-06-24 13:22:45.000000000 +0200
++++ properties-service.xml 2011-06-24 13:41:48.865959790 +0200
+@@ -39,6 +39,11 @@
+
+ <mbean code="org.jboss.varia.property.SystemPropertiesService"
+ name="jboss:type=Service,name=SystemProperties">
++
+ <attribute name="Properties">
+ exo.conf.dir.name=gatein
+ gatein.runtime.context=epp
+ </attribute>
-+
- <!--
- | Load properties from each of the given comma seperated URLs
-
+
+ <!--
+ | Load properties from each of the given comma seperated URLs
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/run.conf.bat.patch
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/run.conf.bat.patch 2011-06-24 12:13:42 UTC (rev 6732)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/run.conf.bat.patch 2011-06-24 12:55:50 UTC (rev 6733)
@@ -1,10 +1,8 @@
-diff -uNr run.conf.bat.orig run.conf.bat
---- run.conf.bat.orig 2009-10-21 03:28:28.000000000 +0200
-+++ run.conf.bat 2010-03-09 17:17:38.000000000 +0100
-@@ -55,3 +55,6 @@
- rem set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"
+--- run.conf.bat.orig 2011-06-24 14:18:19.000000000 +0200
++++ run.conf.bat 2011-06-24 14:19:53.707990235 +0200
+@@ -56,3 +56,5 @@
:JAVA_OPTS_SET
-+
-+rem # GateIn configuration directory
-+set "JAVA_OPTS=%JAVA_OPTS% -Dexo.conf.dir.name=gatein"
+
++rem # GateIn configuration directory
++set "JAVA_OPTS=%JAVA_OPTS% -Dexo.conf.dir.name=gatein"
More information about the gatein-commits
mailing list