Author: norman.richards(a)jboss.com Date: 2009-07-03 19:48:35 -0400 (Fri, 03 Jul 2009) New Revision: 11240 Modified: branches/community/Seam_2_2/examples/hibernate/build-glassfish.xml branches/community/Seam_2_2/examples/hibernate/build-tomcat55.xml branches/community/Seam_2_2/examples/hibernate/build-tomcat6.xml branches/community/Seam_2_2/examples/hibernate/build-weblogic92.xml branches/community/Seam_2_2/examples/hibernate/build-websphere61.xml branches/community/Seam_2_2/examples/hibernate/resources-tomcat/WEB-INF/classes/log4j.xml Log: JBSEAM-4274 Modified: branches/community/Seam_2_2/examples/hibernate/build-glassfish.xml =================================================================== --- branches/community/Seam_2_2/examples/hibernate/build-glassfish.xml 2009-07-03 22:29:39 UTC (rev 11239) +++ branches/community/Seam_2_2/examples/hibernate/build-glassfish.xml 2009-07-03 23:48:35 UTC (rev 11240) @@ -26,12 +26,14 @@ <include name="lib/dom4j.jar" /> <!-- Hibernate and deps --> - <include name="lib/hibernate.jar"/> + <include name="lib/hibernate-core.jar"/> <include name="lib/hibernate-commons-annotations.jar"/> <include name="lib/hibernate-annotations.jar"/> <include name="lib/hibernate-entitymanager.jar"/> <include name="lib/hibernate-validator.jar"/> - + + <include name="lib/slf4j-api.jar"/> + <include name="lib/slf4j-log4j12.jar"/> <include name="lib/asm.jar" /> <include name="lib/cglib.jar"/> <include name="lib/antlr.jar" /> Modified: branches/community/Seam_2_2/examples/hibernate/build-tomcat55.xml =================================================================== --- branches/community/Seam_2_2/examples/hibernate/build-tomcat55.xml 2009-07-03 22:29:39 UTC (rev 11239) +++ branches/community/Seam_2_2/examples/hibernate/build-tomcat55.xml 2009-07-03 23:48:35 UTC (rev 11240) @@ -8,8 +8,8 @@ <!-- resources --> <property name="resources.dir" value="resources-tomcat" /> - <property name="dist.dir" value="dist-tomcat55" /> - <property name="exploded-archives.dir" value="exploded-archives-tomcat55" /> + <property name="dist.dir" value="dist-tomcat55" /> + <property name="exploded-archives.dir" value="exploded-archives-tomcat55" /> <!-- Libraries to include --> <property name="seam.ui.lib" value="true"/> @@ -26,16 +26,19 @@ <include name="lib/commons-digester.jar"/> <include name="lib/commons-lang.jar"/> <include name="lib/commons-logging.jar"/> + <include name="lib/log4j.jar" /> <include name="lib/jsf-api.jar"/> <include name="lib/jsf-impl.jar"/> <include name="lib/jstl.jar"/> <include name="lib/dom4j.jar" /> - <include name="lib/hibernate.jar"/> + <include name="lib/hibernate-core.jar"/> <include name="lib/hibernate-commons-annotations.jar"/> <include name="lib/hibernate-annotations.jar"/> <include name="lib/hibernate-entitymanager.jar"/> <include name="lib/hibernate-validator.jar"/> <include name="lib/javassist.jar"/> + <include name="lib/slf4j-api.jar"/> + <include name="lib/slf4j-log4j12.jar"/> <include name="lib/persistence-api.jar" /> <include name="lib/el-api.jar" /> <include name="lib/cglib.jar"/> Modified: branches/community/Seam_2_2/examples/hibernate/build-tomcat6.xml =================================================================== --- branches/community/Seam_2_2/examples/hibernate/build-tomcat6.xml 2009-07-03 22:29:39 UTC (rev 11239) +++ branches/community/Seam_2_2/examples/hibernate/build-tomcat6.xml 2009-07-03 23:48:35 UTC (rev 11240) @@ -21,20 +21,23 @@ <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-collections.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-lang.jar"/> - <include name="lib/commons-logging.jar"/> + <include name="lib/commons-collections.jar"/> + <include name="lib/commons-digester.jar"/> + <include name="lib/commons-lang.jar"/> + <include name="lib/commons-logging.jar"/> + <include name="lib/log4j.jar"/> <include name="lib/jsf-api.jar" /> <include name="lib/jsf-impl.jar" /> <include name="lib/jstl.jar" /> <include name="lib/dom4j.jar" /> - <include name="lib/hibernate.jar" /> + <include name="lib/hibernate-core.jar" /> <include name="lib/hibernate-commons-annotations.jar" /> <include name="lib/hibernate-annotations.jar" /> <include name="lib/hibernate-entitymanager.jar" /> <include name="lib/hibernate-validator.jar" /> - <include name="lib/asm.jar" /> + <include name="lib/slf4j-api.jar" /> + <include name="lib/slf4j-log4j12.jar" /> + <include name="lib/asm.jar" /> <include name="lib/javassist.jar" /> <include name="lib/persistence-api.jar" /> <include name="lib/cglib.jar" /> Modified: branches/community/Seam_2_2/examples/hibernate/build-weblogic92.xml =================================================================== --- branches/community/Seam_2_2/examples/hibernate/build-weblogic92.xml 2009-07-03 22:29:39 UTC (rev 11239) +++ branches/community/Seam_2_2/examples/hibernate/build-weblogic92.xml 2009-07-03 23:48:35 UTC (rev 11240) @@ -32,6 +32,7 @@ <include name="lib/commons-digester.jar" /> <include name="lib/commons-collections.jar" /> <include name="lib/commons-logging.jar" /> + <!-- JSF (and related) implementation --> <include name="lib/jsf-api.jar" /> <include name="lib/jsf-impl.jar" /> @@ -39,7 +40,7 @@ <include name="lib/el-api.jar" /> <!-- Hibernate and deps --> - <include name="lib/hibernate.jar" /> + <include name="lib/hibernate-core.jar" /> <include name="lib/hibernate-commons-annotations.jar" /> <include name="lib/hibernate-annotations.jar" /> <include name="lib/hibernate-entitymanager.jar" /> @@ -47,6 +48,8 @@ <include name="lib/persistence-api.jar" /> <include name="lib/cglib.jar" /> <include name="lib/antlr.jar" /> + <include name="lib/slf4j-api.jar"/> + <include name="lib/slf4j-log4j12.jar"/> </fileset> <fileset id="noejb.war.extras" dir="${resources.dir}"> Modified: branches/community/Seam_2_2/examples/hibernate/build-websphere61.xml =================================================================== --- branches/community/Seam_2_2/examples/hibernate/build-websphere61.xml 2009-07-03 22:29:39 UTC (rev 11239) +++ branches/community/Seam_2_2/examples/hibernate/build-websphere61.xml 2009-07-03 23:48:35 UTC (rev 11240) @@ -21,7 +21,7 @@ <import file="../build.xml" /> - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> <!-- Seam deps --> <include name="lib/dom4j.jar" /> <include name="lib/javassist.jar"/> @@ -29,7 +29,8 @@ <!-- Misc --> <include name="lib/commons-beanutils.jar"/> <include name="lib/commons-digester.jar"/> - <include name="lib/commons-collections.jar"/> + <include name="lib/commons-collections.jar"/> + <!-- JSF (and related) implementation --> <include name="lib/jsf-api.jar"/> <include name="lib/jsf-impl.jar"/> @@ -37,12 +38,14 @@ <include name="lib/el-api.jar" /> <!-- Hibernate and deps --> - <include name="lib/hibernate.jar"/> + <include name="lib/hibernate-core.jar"/> <include name="lib/hibernate-commons-annotations.jar"/> <include name="lib/hibernate-annotations.jar"/> <include name="lib/hibernate-entitymanager.jar"/> <include name="lib/hibernate-validator.jar"/> <include name="lib/persistence-api.jar" /> + <include name="lib/slf4j-api.jar"/> + <include name="lib/slf4j-log4j12.jar"/> <include name="lib/cglib.jar"/> <include name="lib/antlr.jar" /> </fileset> Modified: branches/community/Seam_2_2/examples/hibernate/resources-tomcat/WEB-INF/classes/log4j.xml =================================================================== --- branches/community/Seam_2_2/examples/hibernate/resources-tomcat/WEB-INF/classes/log4j.xml 2009-07-03 22:29:39 UTC (rev 11239) +++ branches/community/Seam_2_2/examples/hibernate/resources-tomcat/WEB-INF/classes/log4j.xml 2009-07-03 23:48:35 UTC (rev 11240) @@ -17,7 +17,7 @@ <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> + <!-- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> --> <param name="Target" value="System.out"/> <layout class="org.apache.log4j.PatternLayout">