Author: thomas.heute(a)jboss.com Date: 2007-07-17 06:14:41 -0400 (Tue, 17 Jul 2007) New Revision: 7794 Added: branches/JBoss_Portal_Branch_2_6/build/etc/resources/ branches/JBoss_Portal_Branch_2_6/build/etc/resources/jboss-log4j.xml.diff Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml Log: Add log4j patch for bundle versions Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-17 03:52:58 UTC (rev 7793) +++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-17 10:14:41 UTC (rev 7794) @@ -152,6 +152,10 @@ </sequential> </target> + <target name="patch-log4j"> + <patch patchfile="${source.dir}/build/etc/resources/jboss-log4j.xml.diff" originalfile="${todir}/conf/jboss-log4j.xml" strip="1"/> + </target> + <!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc--> <target name="package-bin" unless="no-doc"> <sequential> @@ -183,7 +187,7 @@ </antcall> <antcall target="package-samples"> <param name="todir" value="${todir}/samples"/> - </antcall> + </antcall> <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/> <copy todir="${todir}/docs/portal/licenses"> <fileset dir="output/docs/licenses"/> @@ -288,6 +292,7 @@ <copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bin}"/> </target> + <!-- | JBoss Portal bundled distribution --> @@ -312,6 +317,10 @@ <include name="server/default/**"/> </fileset> </copy> + <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${portal.build.normal.bundled}"/> + <antcall target="patch-log4j"> + <param name="todir" value="${portal.build.normal.bundled}/server/default"/> + </antcall> </target> <!-- @@ -330,13 +339,17 @@ <copy todir="${portal.build.ha.bundled}"> <fileset dir="${jboss.home}"> <include name="bin/**"/> - <include name="clients/**"/> + <include name="client/**"/> <include name="docs/**"/> <include name="lib/**"/> <include name="server/all/**"/> </fileset> </copy> <copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bundled}"/> + <antcall target="patch-log4j"> + <param name="todir" value="${portal.build.normal.bundled}/server/default"/> + </antcall> + </target> <!-- Create packages --> Added: branches/JBoss_Portal_Branch_2_6/build/etc/resources/jboss-log4j.xml.diff =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/etc/resources/jboss-log4j.xml.diff (rev 0) +++ branches/JBoss_Portal_Branch_2_6/build/etc/resources/jboss-log4j.xml.diff 2007-07-17 10:14:41 UTC (rev 7794) @@ -0,0 +1,22 @@ +diff -u conf.orig/jboss-log4j.xml conf/jboss-log4j.xml +--- conf.orig/jboss-log4j.xml 2007-07-16 23:56:32.000000000 +0200 ++++ conf/jboss-log4j.xml 2007-07-17 09:26:16.000000000 +0200 +@@ -164,6 +164,16 @@ + <priority value="INFO"/> + </category> + ++ <!-- Hibernate got a bit too verbose in JBoss AS 4.2.1.GA --> ++ <category name="org.hibernate.engine.loading.LoadContexts"> ++ <priority value="ERROR"/> ++ </category> ++ ++ <!-- JBoss Cache likes to talk a lot --> ++ <category name="org.jboss.cache.interceptors.CacheLoaderInterceptor"> ++ <priority value="ERROR"/> ++ </category> ++ + <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose --> + <category name="org.jboss.serial"> + <priority value="INFO"/> +Common subdirectories: conf.orig/props and conf/props +Common subdirectories: conf.orig/xmdesc and conf/xmdesc