[jboss-cvs] jboss-seam/examples/wiki ...

[Christian Bauer]

  User: cbauer  
  Date: 07/09/25 10:30:46

  Modified:    examples/wiki   build.xml README.txt
  Log:
  Recommending upgrade of JBoss-bundled Hibernate instead of deploying our own (which caused weird conflicts at runtime)
  
  Revision  Changes    Path
  1.36      +34 -7     jboss-seam/examples/wiki/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/build.xml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -b -r1.35 -r1.36
  --- build.xml	20 Sep 2007 19:05:26 -0000	1.35
  +++ build.xml	25 Sep 2007 14:30:46 -0000	1.36
  @@ -41,8 +41,9 @@
   
       <fileset id="globallibs" dir="${global.lib.dir}">
           <include name="*.jar"/>
  -        <!-- TODO: Don't use the Hibernate in Seam, need newer local version for SequenceStyleGenerator  -->
  -        <exclude name="hibernate*" />
  +        <!-- The Seam bundled Hibernate is too old to even compile this application! -->
  +        <exclude name="hibernate*"/>
  +        <exclude name="ejb3-persistence*"/>
       </fileset>
   
       <fileset id="seamlibs" dir="${seamlibs.dir}">
  @@ -71,7 +72,7 @@
   
           <fileset dir="${global.lib.dir}">
               <include name="*.jar" />
  -            <exclude name="hibernate-*"/>
  +            <exclude name="hibernate*.jar"/>
           </fileset>
           <fileset dir="${local.lib.dir}">
               <include name="*.jar" />
  @@ -126,6 +127,26 @@
           <delete dir="${build.dir}"/>
       </target>
   
  +    <target name="upgradehibernate"
  +            description="Copy updated Hibernate libraries into JBoss AS default/lib/ directory">
  +
  +        <delete>
  +            <fileset dir="${jboss.home}/server/default/lib">
  +                <include name="hibernate*"/>
  +            </fileset>
  +        </delete>
  +        <copy todir="${jboss.home}/server/default/lib">
  +            <fileset dir="${local.lib.dir}">
  +                <include name="hibernate*"/>
  +                <!-- We put this in WEB-INF/lib -->
  +                <exclude name="hibernate-search*"/>
  +                <!-- We don't need that at runtime -->
  +                <exclude name="hibernate-tools*"/>
  +            </fileset>
  +        </copy>
  +
  +    </target>
  +
       <!-- ################## COMPILE ####################### -->
   
       <target name="compileclasses" depends="init"
  @@ -136,7 +157,7 @@
                         debug="${javac.debug}"
                   deprecation="${javac.deprecation}"
                        nowarn="${javac.nowarn}">
  -            <src path="${src.java.dir}" />
  +            <src path="${src.java.dir}"/>
           </javac>
   
           <!-- Copy resources (mapping files, properties, etc.) to classes -->
  @@ -221,7 +242,14 @@
           </copy>
           <copy todir="${exploded.war.dir}/WEB-INF/lib">
               <fileset dir="${local.lib.dir}">
  +                <exclude name="ejb3-persistence*"/>
  +                <exclude name="hibernate3*"/>
                   <exclude name="hibernate-tools*"/>
  +                <exclude name="hibernate-commons*"/>
  +                <exclude name="hibernate-annotations*"/>
  +                <exclude name="hibernate-entitymanager*"/>
  +                <exclude name="hibernate-validator*"/>
  +                <exclude name="mysql-connector*"/>
               </fileset>
           </copy>
   
  @@ -243,9 +271,8 @@
               <fileset dir="${src.etc.dir}">
                   <include name="security.drl" />
                   <include name="messages*.properties"/>
  -                <include name="*jpdl.xml" />
  -                <include name="hibernate.cfg.xml" />
  -                <include name="jbpm.cfg.xml" />
  +                <include name="*jpdl.xml"/>
  +                <include name="jbpm.cfg.xml"/>
                   <include name="*.skin.properties"/>
                   <include name="ehcache.xml"/>
               </fileset>
  
  
  
  1.13      +8 -0      jboss-seam/examples/wiki/README.txt
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: README.txt
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/README.txt,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- README.txt	25 Aug 2007 17:59:27 -0000	1.12
  +++ README.txt	25 Sep 2007 14:30:46 -0000	1.13
  @@ -16,6 +16,10 @@
   
   - Edit build.properties
   
  +- Upgrade/downgrade the Hibernate libraries to the ones bundled with this application:
  +  'ant upgradehibernate' will replace the libraries in server/default/lib of JBoss AS 4.2.1
  +  (Sorry, but no other version works currently and the 4.2.1 bundled libraries are too old.)
  +
   - Run the standalone HSQL DB server with 'ant startdb'
   
   - Call 'ant deploy'
  @@ -28,6 +32,10 @@
   
   - Install JBoss Application Server 4.2.1 GA
   
  +- Upgrade/downgrade the Hibernate libraries bundled with JBoss 4.2.1 to the libraries bundled
  +  with this application. Follow the steps outlined above (edit build.properties, call
  +  'ant upgradehibernate') or copy them manually.
  +
   - Install MySQL 5.x
   
   - Obtain the correct JDBC driver for your MySQL version and copy it into server/default/lib/ of JBoss AS