[jboss-cvs] jboss-seam/examples/wiki/src/etc/WEB-INF ...

[Christian Bauer]

  User: cbauer  
  Date: 07/07/09 12:37:40

  Modified:    examples/wiki/src/etc/WEB-INF  components.xml
  Log:
  Make unit tests run on Embeddable JBoss
  
  Revision  Changes    Path
  1.22      +14 -5     jboss-seam/examples/wiki/src/etc/WEB-INF/components.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: components.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/components.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- components.xml	6 Jul 2007 14:38:37 -0000	1.21
  +++ components.xml	9 Jul 2007 16:37:40 -0000	1.22
  @@ -6,6 +6,7 @@
               xmlns:drools="http://jboss.com/products/seam/drools"
               xmlns:web="http://jboss.com/products/seam/web"
               xmlns:mail="http://jboss.com/products/seam/mail"
  +            xmlns:transaction="http://jboss.com/products/seam/transaction"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation=
                   "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
  @@ -14,6 +15,7 @@
                    http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd
                    http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
                    http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
  +                 http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd
                    http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
   
       <!-- ##### WIKI USER CONFIGURATION ##### -->
  @@ -28,6 +30,9 @@
   
       <core:init debug="false" jndi-pattern="@jndiPattern@"/>
   
  +    <!-- Enabled in embeddable JBoss container -->
  +    <transaction:ejb-transaction installed="@ejbTransaction@"/>
  +
       <!-- Conversation timeout: 30 minutes -->
       <core:manager concurrent-request-timeout="2000"
                     conversation-timeout="180000"
  @@ -41,20 +46,24 @@
           </persistence:parameters>
       </persistence:filter>
   
  -    <!-- TODO: Required for testing but doesn't work with injection: persistence-unit-jndi-name="java:/EntityManagerFactories/wiki" -->
  +    <!-- Use the Seam-started PU or look it up from JNDI if running in Embeddable JBoss -->
  +    <persistence:entity-manager-factory installed="@seamStartsPersistenceUnit@"
  +                                        name="wikiEntityManagerFactory"
  +                                        persistence-unit-name="wiki"/>
  +
       <persistence:managed-persistence-context name="restrictedEntityManager"
                                         auto-create="true"
  -                                      entity-manager-factory="#{wikiEntityManagerFactory}">
  +                                      entity-manager-factory="#{wikiEntityManagerFactory}"
  +                                      persistence-unit-jndi-name="java:/entityManagerFactories/wiki">
           <persistence:filters><value>#{accessLevelFilter}</value></persistence:filters>
       </persistence:managed-persistence-context>
   
       <persistence:managed-persistence-context name="entityManager"
                                         auto-create="true"
  -                                      entity-manager-factory="#{wikiEntityManagerFactory}">
  +                                      entity-manager-factory="#{wikiEntityManagerFactory}"
  +                                      persistence-unit-jndi-name="java:/entityManagerFactories/wiki">
       </persistence:managed-persistence-context>
   
  -    <persistence:entity-manager-factory installed="@seamPersistenceUnit@" name="wikiEntityManagerFactory" persistence-unit-name="wiki"/>
  -
       <component name="restrictedEntityConverter" scope="CONVERSATION" precedence="20"
                  class="org.jboss.seam.ui.converter.EntityConverter">
           <property name="entityManager">#{restrictedEntityManager}</property>