Fisheye: Tag b9e4d29537ce1a8863db9b40e0cc65dbf8274747 refers to a dead (removed) revision in file `win_installer/updater/conf/context.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: win_installer/updater/conf/jboss/ejb-deployer.slim.xml
===================================================================
diff -u
--- win_installer/updater/conf/jboss/ejb-deployer.slim.xml	(revision 0)
+++ win_installer/updater/conf/jboss/ejb-deployer.slim.xml	(revision b9e4d29537ce1a8863db9b40e0cc65dbf8274747)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- The JBoss service configuration file for the EJB deployer service.
+$Id$
+-->
+<server>
+
+  <!-- ==================================================================== -->
+  <!-- J2EE Timer Service                                                   -->
+  <!-- ==================================================================== -->
+
+  <!-- An EJB Timer Service that is Tx aware -->
+  <mbean code="org.jboss.ejb.txtimer.EJBTimerServiceImpl"
+    name="jboss.ejb:service=EJBTimerService">
+    <attribute name="RetryPolicy">jboss.ejb:service=EJBTimerService,retryPolicy=fixedDelay</attribute>
+    <attribute name="PersistencePolicy">jboss.ejb:service=EJBTimerService,persistencePolicy=database</attribute>
+    <attribute name="TimerIdGeneratorClassName">org.jboss.ejb.txtimer.BigIntegerTimerIdGenerator</attribute>
+    <attribute name="TimedObjectInvokerClassName">org.jboss.ejb.txtimer.TimedObjectInvokerImpl</attribute>
+  </mbean>
+
+  <!-- A retry policy that uses a fixed interval in milli seconds -->
+  <mbean code="org.jboss.ejb.txtimer.FixedDelayRetryPolicy" name="jboss.ejb:service=EJBTimerService,retryPolicy=fixedDelay">
+    <attribute name="Delay">100</attribute>
+  </mbean>
+
+  <!-- A persistence policy that does not persist the timer
+  <mbean code="org.jboss.ejb.txtimer.NoopPersistencePolicy" name="jboss.ejb:service=EJBTimerService,persistencePolicy=noop"/>
+  -->
+
+  <!-- A persistence policy that persistes timers to a database -->
+  <mbean code="org.jboss.ejb.txtimer.DatabasePersistencePolicy" name="jboss.ejb:service=EJBTimerService,persistencePolicy=database">
+    <!-- DataSource JNDI name -->
+    <depends optional-attribute-name="DataSource">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+    <!-- The plugin that handles database persistence -->
+    <attribute name="DatabasePersistencePlugin">org.jboss.ejb.txtimer.GeneralPurposeDatabasePersistencePlugin</attribute>
+  </mbean>
+
+  <!-- ==================================================================== -->
+  <!-- EJB Deployer                                                         -->
+  <!-- ==================================================================== -->
+
+  <!-- EJB deployer, remove to disable EJB behavior-->
+  <mbean code="org.jboss.ejb.EJBDeployer" name="jboss.ejb:service=EJBDeployer">
+    <!-- A flag indicating if the deployer should validate the
+    ejb-jar.xml/jboss.xml descriptors and components
+    -->
+    <attribute name="VerifyDeployments">true</attribute>
+    <!-- A flag indicating if the xml parser should validate the descriptor
+    DTDs
+    -->
+    <attribute name="ValidateDTDs">false</attribute>
+    <!-- A flag indicating if the verifier should be verbose about its
+    operation
+    -->
+    <attribute name="VerifierVerbose">true</attribute>
+    <!-- Setting this to 'true' will cause all deployments
+     to fail when the Verifier detected a problem with the contained
+     Beans. If false, warnings/errors will be logged but the deployment
+     will not fail.
+    -->
+    <attribute name="StrictVerifier">true</attribute>
+
+    <!-- The EJBDeployer needs the JTA transaction manager service -->
+    <depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends>
+    <!-- The dynamic class loading simple web server -->
+    <!--  <depends optional-attribute-name="WebServiceName">jboss:service=WebService</depends> -->
+  </mbean>
+
+</server>
Index: win_installer/updater/conf/jboss/jboss-service.slim.xml
===================================================================
diff -u
--- win_installer/updater/conf/jboss/jboss-service.slim.xml	(revision 0)
+++ win_installer/updater/conf/jboss/jboss-service.slim.xml	(revision b9e4d29537ce1a8863db9b40e0cc65dbf8274747)
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$ -->
+
+<!-- ===================================================================== -->
+<!--  JBoss Server Configuration                                           -->
+<!-- ===================================================================== -->
+
+<server>
+
+   <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
+     can be restricted to specific jars by specifying them in the archives
+     attribute.
+    -->
+   <classpath codebase="lib" archives="*"/>
+
+
+   <!-- ==================================================================== -->
+   <!-- JSR-77 Single JBoss Server Management Domain                         -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.management.j2ee.LocalJBossServerDomain"
+      name="jboss.management.local:j2eeType=J2EEDomain,name=Manager">
+      <attribute name="MainDeployer">jboss.system:service=MainDeployer</attribute>
+      <attribute name="SARDeployer">jboss.system:service=ServiceDeployer</attribute>
+      <attribute name="EARDeployer">jboss.j2ee:service=EARDeployer</attribute>
+      <attribute name="EJBDeployer">jboss.ejb:service=EJBDeployer</attribute>
+      <attribute name="RARDeployer">jboss.jca:service=RARDeployer</attribute>
+      <attribute name="CMDeployer">jboss.jca:service=ConnectionFactoryDeployer</attribute>
+      <attribute name="WARDeployer">jboss.web:service=WebServer</attribute>
+      <attribute name="MailService">jboss:service=Mail</attribute>
+      <attribute name="JNDIService">jboss:service=Naming</attribute>
+      <attribute name="JTAService">jboss:service=TransactionManager</attribute>
+   </mbean>
+   
+   <!-- A Thread pool service -->
+   <mbean code="org.jboss.util.threadpool.BasicThreadPool"
+      name="jboss.system:service=ThreadPool">
+      <attribute name="Name">JBoss System Threads</attribute>
+      <attribute name="ThreadGroupName">System Threads</attribute>
+      <!-- How long a thread will live without any tasks in MS -->
+      <attribute name="KeepAliveTime">60000</attribute>
+      <!-- The max number of threads in the pool -->
+      <attribute name="MaximumPoolSize">10</attribute>
+      <!-- The max number of tasks before the queue is full -->
+      <attribute name="MaximumQueueSize">1000</attribute>
+      <!-- The behavior of the pool when a task is added and the queue is full.
+      abort - a RuntimeException is thrown
+      run - the calling thread executes the task
+      wait - the calling thread blocks until the queue has room
+      discard - the task is silently discarded without being run
+      discardOldest - check to see if a task is about to complete and enque
+         the new task if possible, else run the task in the calling thread
+      -->
+      <attribute name="BlockingMode">run</attribute>
+   </mbean>
+
+   <!-- Preload all custom editors for VMs that don't use the thread
+        context class loader when searching for PropertyEditors. Uncomment
+        if your JDK 1.3.0 VM fails to find JBoss PropertyEditors.
+   <mbean code="org.jboss.varia.property.PropertyEditorManagerService"
+     name="jboss:type=Service,name=BootstrapEditors">
+     <attribute name="BootstrapEditors">
+       java.math.BigDecimal=org.jboss.util.propertyeditor.BigDecimalEditor
+       java.lang.Boolean=org.jboss.util.propertyeditor.BooleanEditor
+       java.lang.Class=org.jboss.util.propertyeditor.ClassEditor
+       java.util.Date=org.jboss.util.propertyeditor.DateEditor
+       java.io.File=org.jboss.util.propertyeditor.FileEditor
+       java.net.InetAddress=org.jboss.util.propertyeditor.InetAddressEditor
+       java.lang.Integer=org.jboss.util.propertyeditor.IntegerEditor
+       javax.management.ObjectName=org.jboss.mx.util.propertyeditor.ObjectNameEditor
+       java.util.Properties=org.jboss.util.propertyeditor.PropertiesEditor
+       [Ljava.lang.String;=org.jboss.util.propertyeditor.StringArrayEditor
+       java.net.URL=org.jboss.util.propertyeditor.URLEditor
+     </attribute>
+   </mbean>
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- Log4j Initialization                                                 -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.logging.Log4jService"
+      name="jboss.system:type=Log4jService,service=Logging"
+	  xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
+      <attribute name="ConfigurationURL">resource:log4j.xml</attribute>
+      <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
+      this needs to be set to avoid a possible deadlock on exception at the
+      appender level. See bug#696819.
+      -->
+      <attribute name="Log4jQuietMode">true</attribute>
+      <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
+      <attribute name="RefreshPeriod">60</attribute>
+   </mbean>
+
+
+   <!-- ==================================================================== -->
+   <!-- Service Binding                                                      -->
+   <!-- ==================================================================== -->
+
+   <!-- Automatically activated when generatting the clustering environment -->
+   <!-- @TESTSUITE_CLUSTER_CONFIG@ -->
+
+   <!--
+      | Binding service manager for port/host mapping. This is a sample
+      | config that demonstrates a JBoss instances with a server name 'ports-01'
+      | loading its bindings from an XML file using the ServicesStoreFactory
+      | implementation returned by the XMLServicesStoreFactory.
+      |
+      | ServerName: The unique name assigned to a JBoss server instance for
+      | lookup purposes. This allows a single ServicesStore to handle mulitiple
+      | JBoss servers.
+      |
+      | StoreURL: The URL string passed to org.jboss.services.binding.ServicesStore
+      | during initialization that specifies how to connect to the bindings store.
+      | StoreFactory: The org.jboss.services.binding.ServicesStoreFactory interface
+      | implementation to create to obtain the ServicesStore instance.
+
+   <mbean code="org.jboss.services.binding.ServiceBindingManager"
+     name="jboss.system:service=ServiceBindingManager">
+     <attribute name="ServerName">ports-01</attribute>
+     <attribute name="StoreURL">${jboss.home.url}/docs/examples/binding-manager/sample-bindings.xml</attribute>
+     <attribute name="StoreFactoryClassName">
+       org.jboss.services.binding.XMLServicesStoreFactory
+     </attribute>
+   </mbean>
+
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- JNDI                                                                 -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.naming.NamingService"
+      name="jboss:service=Naming"
+      xmbean-dd="resource:xmdesc/NamingService-xmbean.xml">
+      <!-- The call by value mode. true if all lookups are unmarshalled using
+      the caller's TCL, false if in VM lookups return the value by reference.
+      -->
+      <attribute name="CallByValue">false</attribute>
+      <!-- The listening port for the bootstrap JNP service. Set this to -1
+        to run the NamingService without the JNP invoker listening port.
+      -->
+      <attribute name="Port">1099</attribute>
+      <!-- The bootstrap JNP server bind address. This also sets the default
+      RMI service bind address. Empty == all addresses
+       -->
+      <attribute name="BindAddress">${jboss.bind.address}</attribute>
+      <!-- The port of the RMI naming service, 0 == anonymous -->
+      <attribute name="RmiPort">1098</attribute>
+      <!-- The RMI service bind address. Empty == all addresses
+       -->
+      <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
+      <!-- The thread pool service used to control the bootstrap lookups -->
+      <depends optional-attribute-name="LookupPool"
+         proxy-type="attribute">jboss.system:service=ThreadPool</depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Security                                                             -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.security.plugins.SecurityConfig"
+      name="jboss.security:service=SecurityConfig">
+      <attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute>
+   </mbean>
+   <mbean code="org.jboss.security.auth.login.XMLLoginConfig"
+      name="jboss.security:service=XMLLoginConfig">
+      <attribute name="ConfigResource">login-config.xml</attribute>
+   </mbean>
+
+   <!-- JAAS security manager and realm mapping -->
+   <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
+      name="jboss.security:service=JaasSecurityManager">
+      <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>
+      <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute>
+      <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout
+      in seconds.
+      If you want to disable caching of security credentials, set this to 0 to
+      force authentication to occur every time. This has no affect if the
+      AuthenticationCacheJndiName has been changed from the default value.
+      -->
+      <attribute name="DefaultCacheTimeout">0</attribute>
+      <!-- DefaultCacheResolution: Specifies the default timed cache policy
+      resolution in seconds. This controls the interval at which the cache
+      current timestamp is updated and should be less than the DefaultCacheTimeout
+      in order for the timeout to be meaningful. This has no affect if the
+      AuthenticationCacheJndiName has been changed from the default value.
+      -->
+      <attribute name="DefaultCacheResolution">60</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Transactions                                                         -->
+   <!-- ==================================================================== -->
+   <!-- The configurable Xid factory.  For use with Oracle, set pad to true -->
+   <mbean code="org.jboss.tm.XidFactory"
+      name="jboss:service=XidFactory">
+      <!--attribute name="Pad">true</attribute-->
+   </mbean>
+
+   <!--
+      | The fast in-memory transaction manager.
+    -->
+   <mbean code="org.jboss.tm.TransactionManagerService"
+      name="jboss:service=TransactionManager"
+      xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
+      <attribute name="TransactionTimeout">300</attribute>
+      <!-- set to false to disable transaction demarcation over IIOP -->
+      <attribute name="GlobalIdsEnabled">true</attribute>
+      <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
+   </mbean>
+   <!--
+      | UserTransaction support.
+    -->
+   <mbean code="org.jboss.tm.usertx.server.ClientUserTransactionService"
+      name="jboss:service=ClientUserTransaction"
+      xmbean-dd="resource:xmdesc/ClientUserTransaction-xmbean.xml">
+      <depends>
+         <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+            name="jboss:service=proxyFactory,target=ClientUserTransactionFactory">
+            <attribute name="InvokerName">jboss:service=invoker,type=jrmp</attribute>
+            <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
+            <attribute name="JndiName">UserTransactionSessionFactory</attribute>
+            <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSessionFactory</attribute>
+            <attribute name="ClientInterceptors">
+               <interceptors>
+                  <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+                  <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+               </interceptors>
+            </attribute>
+            <depends>jboss:service=invoker,type=jrmp</depends>
+         </mbean>
+      </depends>
+      <depends optional-attribute-name="TxProxyName">
+         <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+            name="jboss:service=proxyFactory,target=ClientUserTransaction">
+            <attribute name="InvokerName">jboss:service=invoker,type=jrmp</attribute>
+            <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
+            <attribute name="JndiName"></attribute>
+            <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSession</attribute>
+            <attribute name="ClientInterceptors">
+               <interceptors>
+                  <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+                  <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+               </interceptors>
+            </attribute>
+            <depends>jboss:service=invoker,type=jrmp</depends>
+         </mbean>
+      </depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Invokers to the JMX node                                             -->
+   <!-- ==================================================================== -->
+
+   <!-- RMI/JRMP invoker -->
+   <mbean code="org.jboss.invocation.jrmp.server.JRMPInvoker"
+      name="jboss:service=invoker,type=jrmp">
+      <attribute name="RMIObjectPort">4444</attribute>
+      <attribute name="ServerAddress">${jboss.bind.address}</attribute>
+      <!--
+      <attribute name="RMIClientSocketFactory">custom</attribute>
+      <attribute name="RMIServerSocketFactory">custom</attribute>
+      <attribute name="RMIServerSocketAddr">custom</attribute>
+      <attribute name="SecurityDomain">ssl-domain-name</attribute>
+      -->
+      <depends>jboss:service=TransactionManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.invocation.local.LocalInvoker"
+      name="jboss:service=invoker,type=local">
+
+      <depends>jboss:service=TransactionManager</depends>
+   </mbean>
+
+
+   <!-- ==================================================================== -->
+   <!-- Monitoring and Management                                            -->
+   <!-- ==================================================================== -->
+
+   <!-- Uncomment to enable JMX monitoring of the bean cache
+   <mbean code="org.jboss.monitor.BeanCacheMonitor"
+          name="jboss.monitor:name=BeanCacheMonitor"/>
+   -->
+
+   <!-- Uncomment to enable JMX monitoring of the entity bean locking
+   <mbean code="org.jboss.monitor.EntityLockMonitor"
+          name="jboss.monitor:name=EntityLockMonitor"/>
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- An MBean that is a registry for JDBC type-mapping metadata           -->
+   <!-- ==================================================================== -->
+
+   <mbean code="org.jboss.ejb.plugins.cmp.jdbc.metadata.MetaDataLibrary"
+      name="jboss.jdbc:service=metadata"/>
+
+   <!-- ==================================================================== -->
+   <!-- Deployment Scanning                                                  -->
+   <!-- ==================================================================== -->
+
+   <!-- An mbean for hot deployment/undeployment of archives.
+   -->
+   <mbean code="org.jboss.deployment.scanner.URLDeploymentScanner"
+      name="jboss.deployment:type=DeploymentScanner,flavor=URL">
+
+      <!-- Uncomment (and comment/remove version below) to enable usage of the
+        DeploymentCache
+      <depends optional-attribute-name="Deployer">jboss.deployment:type=DeploymentCache</depends>
+      -->
+      <depends optional-attribute-name="Deployer">jboss.system:service=MainDeployer</depends>
+
+      <!-- The URLComparator can be used to specify a deployment ordering
+           for deployments found in a scanned directory.  The class specified
+           must be an implementation of java.util.Comparator, it must be able
+           to compare two URL objects, and it must have a no-arg constructor.
+           Two deployment comparators are shipped with JBoss:
+             - org.jboss.deployment.DeploymentSorter
+               Sorts by file extension, as follows:
+                 "sar", "service.xml", "rar", "jar", "war", "wsr", "ear", "zip",
+                 "*"
+             - org.jboss.deployment.scanner.PrefixDeploymentSorter
+               If the name portion of the url begins with 1 or more digits, those
+               digits are converted to an int (ignoring leading zeroes), and
+               files are deployed in that order.  Files that do not start with
+               any digits will be deployed first, and they will be sorted by
+               extension as above with DeploymentSorter.
+      -->
+      <attribute name="URLComparator">org.jboss.deployment.DeploymentSorter</attribute>
+      <!--
+      <attribute name="URLComparator">org.jboss.deployment.scanner.PrefixDeploymentSorter</attribute>
+      -->
+
+      <!-- The FilterInstance specifies a URLLister.URLFilter for scanned
+           directories. This DeploymentFilter is initialized with the given
+           prefixes, suffixes and matches that define which URLs should be
+           ignored.
+      -->
+      <attribute name="FilterInstance"
+         attributeClass="org.jboss.deployment.scanner.DeploymentFilter"
+         serialDataType="javaBean">
+         <!-- Files starting with theses strings are ignored -->
+         <property name="prefixes">#,%,\,,.,_$</property>
+         <!-- Files ending with theses strings are ignored -->
+         <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property>
+         <!-- Files matching with theses strings are ignored -->
+         <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property>
+      </attribute>
+
+      <!-- Frequency in milliseconds to rescan the URLs for changes -->
+      <attribute name="ScanPeriod">5000</attribute>
+      <!-- A flag to disable the scans -->
+      <attribute name="ScanEnabled">true</attribute>
+
+      <!-- URLs are comma separated and resolve relative to the server home URL
+         unless the given path is absolute. If the URL ends in "/" it is
+         considered a collection and scanned, otherwise it is simply deployed;
+         this follows RFC2518 convention and allows discrimination between
+         collections and directories that are simply unpacked archives.
+
+         URLs may be local (file:) or remote (http:). Scanning is supported
+         for remote URLs but unpacked deployment units are not.
+
+         Example URLs:
+            deploy/
+                 scans ${jboss.server.url}/deploy/, which is local or remote
+                 depending on the URL used to boot the server
+            ${jboss.server.home}/deploy/
+                 scans ${jboss.server.home)/deploy, which is always local
+            file:/var/opt/myapp.ear
+                 deploy myapp.ear from a local location
+            file:/var/opt/apps/
+                 scans the specified directory
+            http://www.test.com/netboot/myapp.ear
+                 deploys myapp.ear from a remote location
+            http://www.test.com/netboot/apps/
+                 scans the specified WebDAV location
+       -->
+      <attribute name="URLs">
+         deploy/
+      </attribute>
+
+      <!-- Indicates if the scanner should recursively scan directories that
+      contain no "." in their names. This can be used to group applications
+      and services that must be deployed and that have the same
+      logical function in the same directory i.e.
+        deploy/JMX/
+        deploy/JMS/
+        ...
+      -->
+
+      <attribute name="RecursiveSearch">True</attribute>
+
+   </mbean>
+
+</server>
Index: win_installer/updater/conf/jboss/standardjboss.slim.xml
===================================================================
diff -u
--- win_installer/updater/conf/jboss/standardjboss.slim.xml	(revision 0)
+++ win_installer/updater/conf/jboss/standardjboss.slim.xml	(revision b9e4d29537ce1a8863db9b40e0cc65dbf8274747)
@@ -0,0 +1,1038 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss PUBLIC
+   "-//JBoss//DTD JBOSS 4.0//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+<!-- ===================================================================== -->
+<!--  Standard JBoss EJB Configurations                                    -->
+<!-- ===================================================================== -->
+<!-- $Id$ -->
+
+<jboss>
+  <enforce-ejb-restrictions>false</enforce-ejb-restrictions>
+
+  <invoker-proxy-bindings>
+
+    <invoker-proxy-binding>
+      <name>entity-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmp</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+          <list-entity>
+            <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </list-entity>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>clustered-entity-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+          <list-entity>
+            <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </list-entity>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>stateless-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmp</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>clustered-stateless-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>stateful-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmp</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.StatefulSessionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>clustered-stateful-rmi-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+      <proxy-factory-config>
+        <client-interceptors>
+          <home>
+            <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </home>
+          <bean>
+            <interceptor>org.jboss.proxy.ejb.StatefulSessionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor call-by-value="false">org.jboss.invocation.InvokerInterceptor</interceptor>
+            <interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>
+          </bean>
+        </client-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>message-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
+      <proxy-factory-config>
+        <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
+        <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
+        <CreateJBossMQDestination>true</CreateJBossMQDestination>
+        <!-- WARN: Don't set this to zero until a bug in the pooled executor is fixed -->
+        <MinimumSize>1</MinimumSize>
+        <MaximumSize>15</MaximumSize>
+        <KeepAliveMillis>30000</KeepAliveMillis>
+        <MaxMessages>1</MaxMessages>
+        <MDBConfig>
+          <ReconnectIntervalSec>10</ReconnectIntervalSec>
+          <DLQConfig>
+            <DestinationQueue>queue/DLQ</DestinationQueue>
+            <MaxTimesRedelivered>10</MaxTimesRedelivered>
+            <TimeToLive>0</TimeToLive>
+          </DLQConfig>
+        </MDBConfig>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <!-- Uncomment to use JMS message inflow from jmsra.rar
+    <invoker-proxy-binding>
+      <name>message-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.inflow.JBossJMSMessageEndpointFactory</proxy-factory>
+      <proxy-factory-config>
+        <activation-config>
+           <activation-config-property>
+              <activation-config-property-name>providerAdapterJNDI</activation-config-property-name>
+              <activation-config-property-value>DefaultJMSProvider</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>minSession</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>maxSession</activation-config-property-name>
+              <activation-config-property-value>15</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>keepAlive</activation-config-property-name>
+              <activation-config-property-value>60000</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>maxMessages</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>reconnectInterval</activation-config-property-name>
+              <activation-config-property-value>10</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>useDLQ</activation-config-property-name>
+              <activation-config-property-value>true</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQHandler</activation-config-property-name>
+              <activation-config-property-value>org.jboss.resource.adapter.jms.inflow.dlq.GenericDLQHandler</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQJNDIName</activation-config-property-name>
+              <activation-config-property-value>queue/DLQ</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQMaxResent</activation-config-property-name>
+              <activation-config-property-value>10</activation-config-property-value>
+           </activation-config-property>
+        </activation-config>
+        <endpoint-interceptors>
+          <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+          <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
+          <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+          <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+        </endpoint-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+    -->
+    
+    <invoker-proxy-binding>
+      <name>singleton-message-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
+      <proxy-factory-config>
+        <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
+        <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
+        <CreateJBossMQDestination>true</CreateJBossMQDestination>
+        <!-- WARN: Don't set this to zero until a bug in the pooled executor is fixed -->
+        <MinimumSize>1</MinimumSize>
+        <MaximumSize>1</MaximumSize>
+        <KeepAliveMillis>30000</KeepAliveMillis>
+        <MaxMessages>1</MaxMessages>
+        <MDBConfig>
+          <ReconnectIntervalSec>10</ReconnectIntervalSec>
+          <DLQConfig>
+            <DestinationQueue>queue/DLQ</DestinationQueue>
+            <MaxTimesRedelivered>10</MaxTimesRedelivered>
+            <TimeToLive>0</TimeToLive>
+          </DLQConfig>
+        </MDBConfig>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>message-inflow-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.inflow.JBossMessageEndpointFactory</proxy-factory>
+      <proxy-factory-config>
+        <endpoint-interceptors>
+          <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+          <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
+          <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+          <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+        </endpoint-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>iiop</name>
+      <invoker-mbean>jboss:service=invoker,type=iiop</invoker-mbean>
+      <proxy-factory>org.jboss.proxy.ejb.IORFactory</proxy-factory>
+      <proxy-factory-config>
+        <web-class-loader>org.jboss.iiop.WebCL</web-class-loader>
+        <poa>per-servant</poa>
+        <register-ejbs-in-jnp-context>true</register-ejbs-in-jnp-context>
+        <jnp-context>iiop</jnp-context>
+        <interface-repository-supported>false</interface-repository-supported>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+
+    <invoker-proxy-binding>
+      <name>jms-message-inflow-driven-bean</name>
+      <invoker-mbean>default</invoker-mbean>
+      <proxy-factory>org.jboss.ejb.plugins.inflow.JBossJMSMessageEndpointFactory</proxy-factory>
+      <proxy-factory-config>
+        <activation-config>
+           <activation-config-property>
+              <activation-config-property-name>providerAdapterJNDI</activation-config-property-name>
+              <activation-config-property-value>DefaultJMSProvider</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>minSession</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>maxSession</activation-config-property-name>
+              <activation-config-property-value>15</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>keepAlive</activation-config-property-name>
+              <activation-config-property-value>60000</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>maxMessages</activation-config-property-name>
+              <activation-config-property-value>1</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>reconnectInterval</activation-config-property-name>
+              <activation-config-property-value>10</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>useDLQ</activation-config-property-name>
+              <activation-config-property-value>true</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQHandler</activation-config-property-name>
+              <activation-config-property-value>org.jboss.resource.adapter.jms.inflow.dlq.GenericDLQHandler</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQJNDIName</activation-config-property-name>
+              <activation-config-property-value>queue/DLQ</activation-config-property-value>
+           </activation-config-property>
+           <activation-config-property>
+              <activation-config-property-name>DLQMaxResent</activation-config-property-name>
+              <activation-config-property-value>10</activation-config-property-value>
+           </activation-config-property>
+        </activation-config>
+        <endpoint-interceptors>
+          <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+          <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
+          <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+          <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+        </endpoint-interceptors>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+  </invoker-proxy-bindings>
+
+  <container-configurations>
+
+    <container-configuration>
+      <container-name>Standard CMP 2.x EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <call-ejb-store-on-clean>true</call-ejb-store-on-clean>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.InvalidableEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>B</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <!--
+         | This is like standard IPT but with global (cross-transactional) row cache behind,
+         | i.e. no locking in EJB layer + global persistence data cache
+      -->
+      <container-name>cmp2.x jdbc2 pm</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>true</insert-after-ejb-post-create>
+      <call-ejb-store-on-clean>true</call-ejb-store-on-clean>
+      <container-interceptors>
+         <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+         <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+         <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+         <interceptor>org.jboss.ejb.plugins.cmp.jdbc2.RelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache> 
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc2.JDBCStoreManager2</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy> 
+      <container-cache-conf>
+         <cache-policy-conf>
+            <min-capacity>500</min-capacity>
+            <max-capacity>10000</max-capacity>
+         </cache-policy-conf>
+         <cache-policy-conf-other>
+            <partitions>10</partitions>
+            <!-- uncomment to use JDBC java.sql.Statement.executeBatch()
+            <batch-commit-strategy/>
+            -->
+         </cache-policy-conf-other>
+      </container-cache-conf>
+      <container-pool-conf>
+         <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>C</commit-option> <!-- don't change, irrelevant, use container-cache-conf -->
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered CMP 2.x EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>B</commit-option>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard CMP 2.x EntityBean with cache invalidation</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+        <interceptor>org.jboss.cache.invalidation.triggers.EntityBeanCacheBatchInvalidatorInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.InvalidableEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Instance Per Transaction CMP 2.x EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
+      <container-cache-conf/>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>C</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard CMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered CMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Instance Per Transaction CMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
+      <container-cache-conf/>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>C</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard Stateless SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>stateless-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.webservice.server.ServiceEndpointInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.webservice.server.ServiceEndpointInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.StatelessSessionInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered Stateless SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-stateless-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.webservice.server.ServiceEndpointInterceptor </interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.webservice.server.ServiceEndpointInterceptor </interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.StatelessSessionInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+
+    <container-configuration>
+      <container-name>Standard Stateful SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>stateful-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+      </container-interceptors>
+      <instance-cache>org.jboss.ejb.plugins.StatefulSessionInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.StatefulSessionFilePersistenceManager</persistence-manager>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <remover-period>1800</remover-period>
+          <max-bean-life>1800</max-bean-life>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered Stateful SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-stateful-rmi-invoker</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.StatefulHASessionSynchronisationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-cache>org.jboss.ejb.plugins.StatefulHASessionInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.StatefulHASessionPersistenceManager</persistence-manager>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <remover-period>1800</remover-period>
+          <max-bean-life>1800</max-bean-life>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard BMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Clustered BMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+      <container-cache-conf>
+        <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+        <cache-policy-conf>
+          <min-capacity>50</min-capacity>
+          <max-capacity>1000000</max-capacity>
+          <overager-period>300</overager-period>
+          <max-bean-age>600</max-bean-age>
+          <resizer-period>400</resizer-period>
+          <max-cache-miss-period>60</max-cache-miss-period>
+          <min-cache-miss-period>1</min-cache-miss-period>
+          <cache-load-factor>0.75</cache-load-factor>
+        </cache-policy-conf>
+      </container-cache-conf>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>A</commit-option>
+      <cluster-config>
+         <partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Instance Per Transaction BMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-rmi-invoker</invoker-proxy-binding-name>
+      <sync-on-commit-only>false</sync-on-commit-only>
+      <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor>org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+      <instance-cache>org.jboss.ejb.plugins.PerTxEntityInstanceCache</instance-cache>
+      <persistence-manager>org.jboss.ejb.plugins.BMPPersistenceManager</persistence-manager>
+      <locking-policy>org.jboss.ejb.plugins.lock.NoLock</locking-policy>
+      <container-cache-conf/>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+      <commit-option>C</commit-option>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard Message Driven Bean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>message-driven-bean</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.RunAsSecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Singleton Message Driven Bean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>singleton-message-driven-bean</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.RunAsSecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard Message Inflow Driven Bean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>message-inflow-driven-bean</invoker-proxy-binding-name>
+      <container-interceptors>
+        <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+        <interceptor>org.jboss.ejb.plugins.RunAsSecurityInterceptor</interceptor>
+        <!-- CMT -->
+        <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <!-- BMT -->
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor>
+        <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor>
+        <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+      </container-interceptors>
+      <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool>
+      <instance-cache></instance-cache>
+      <persistence-manager></persistence-manager>
+      <container-pool-conf>
+        <MaximumSize>100</MaximumSize>
+      </container-pool-conf>
+    </container-configuration>
+
+  </container-configurations>
+
+</jboss>
Fisheye: Tag b9e4d29537ce1a8863db9b40e0cc65dbf8274747 refers to a dead (removed) revision in file `win_installer/updater/conf/log4j.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b9e4d29537ce1a8863db9b40e0cc65dbf8274747 refers to a dead (removed) revision in file `win_installer/updater/conf/login-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b9e4d29537ce1a8863db9b40e0cc65dbf8274747 refers to a dead (removed) revision in file `win_installer/updater/conf/news.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b9e4d29537ce1a8863db9b40e0cc65dbf8274747 refers to a dead (removed) revision in file `win_installer/updater/conf/wrapper.conf'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: win_installer/updater/documents/license.txt
===================================================================
diff -u -r5ca8955bb88102cb8576294b9e079842899a0a4c -rb9e4d29537ce1a8863db9b40e0cc65dbf8274747
--- win_installer/updater/documents/license.txt	(.../license.txt)	(revision 5ca8955bb88102cb8576294b9e079842899a0a4c)
+++ win_installer/updater/documents/license.txt	(.../license.txt)	(revision b9e4d29537ce1a8863db9b40e0cc65dbf8274747)
@@ -1,4 +1,4 @@
-LAMS 2.2 is released under the GPL license detailed below.  This package
+LAMS 2.3 is released under the GPL license detailed below.  This package
 also includes other libraries/packages, whose respective licenses are
 detailed below.
 
Index: win_installer/updater/documents/readme.txt
===================================================================
diff -u -ref00d48d7e1844c2bf2c1dc9847a75e695f97616 -rb9e4d29537ce1a8863db9b40e0cc65dbf8274747
--- win_installer/updater/documents/readme.txt	(.../readme.txt)	(revision ef00d48d7e1844c2bf2c1dc9847a75e695f97616)
+++ win_installer/updater/documents/readme.txt	(.../readme.txt)	(revision b9e4d29537ce1a8863db9b40e0cc65dbf8274747)
@@ -1,14 +1,14 @@
-LAMS 2.2 - Learning Activity Management System
+LAMS 2.3 - Learning Activity Management System
 ----------------------------------------------
 
-This is a pre-packaged copy of LAMS 2.2 for Windows 2000, XP, or 2003.
+This is a pre-packaged copy of LAMS 2.3 for Windows 2000, XP, or 2003.
 For the source code, please see the 'Building LAMS' wiki at 
 
 	http://wiki.lamsfoundation.org/display/lams/Building+LAMS 
 
 for more information.
 
-For release notes goto: http://wiki.lamsfoundation.org/display/lams/2.2
+For release notes goto: http://wiki.lamsfoundation.org/display/lams/2.3
 
 NOTE TO SYSADMINS: If you are doing an upgrade and your users report problems in 
 authoring, they may need to clear their browser cache. If you have a user see 
@@ -21,11 +21,6 @@
 current version. Follow the instructions at:
 http://wiki.lamsfoundation.org/display/lams/flvPlayer.
 
-NOTE TO SYSADMINS: If you are updating LAMS 2.1 to LAMS 2.2, and you currently 
-use LDAP authentication, please check the LDAP wiki page for changes to the 
-configuration values in LAMS 2.2:
-http://wiki.lamsfoundation.org/display/lamsdocs/LDAP+Configuration
-
 1. Startup and Shutdown
 =======================
 To use LAMS 2, first make sure it is started - use the 'Start LAMS' shortcut
Fisheye: Tag b9e4d29537ce1a8863db9b40e0cc65dbf8274747 refers to a dead (removed) revision in file `win_installer/updater/src/ant/update-2.2-specific.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: win_installer/updater/src/ant/update-deploy-tools.xml
===================================================================
diff -u -red7331c3429f396672d217b7339b1a8266873543 -rb9e4d29537ce1a8863db9b40e0cc65dbf8274747
--- win_installer/updater/src/ant/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision ed7331c3429f396672d217b7339b1a8266873543)
+++ win_installer/updater/src/ant/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision b9e4d29537ce1a8863db9b40e0cc65dbf8274747)
@@ -120,7 +120,8 @@
 		</path>
 		
 		<!-- 2.2 SPECIFIC UPDATE!!!!!!!!!!!! -->
-        <echo>BEGIN Updating application.xml</echo>
+		<!--
+		<echo>BEGIN Updating application.xml</echo>
         <java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
             <arg value="${jboss.deploy}" />
             <arg value="transform.jar" />
@@ -141,6 +142,7 @@
             <arg value="${jboss.deploy}" />
             <arg value="tk-discovery-1.0.0.jar" />
         </java>
+        -->
         <!-- END 2.2 SPECIFIC UPDATE!!!!!!!!!!!! -->
 		
 	</target>
Fisheye: Tag b9e4d29537ce1a8863db9b40e0cc65dbf8274747 refers to a dead (removed) revision in file `win_installer/updater/src/ant/update-mysql-ds-xml-2.1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b9e4d29537ce1a8863db9b40e0cc65dbf8274747 refers to a dead (removed) revision in file `win_installer/updater/src/sql/addAutoPatchTable.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: win_installer/updater/src/updater.nsi
===================================================================
diff -u -r2f122c11852bc93249aa97ec643b80722f73e7ae -rb9e4d29537ce1a8863db9b40e0cc65dbf8274747
--- win_installer/updater/src/updater.nsi	(.../updater.nsi)	(revision 2f122c11852bc93249aa97ec643b80722f73e7ae)
+++ win_installer/updater/src/updater.nsi	(.../updater.nsi)	(revision b9e4d29537ce1a8863db9b40e0cc65dbf8274747)
@@ -48,13 +48,12 @@
 !insertmacro LineFind
 
 # constants
-!define VERSION "2.2"
-!define PREVIOUS_VERSION "2.1"
-!define PREVIOUS_VERSION_2 "2.1.1" # FOR 2.2 ONLY
+!define VERSION "2.3"
+!define PREVIOUS_VERSION "2.2"
 !define LANGUAGE_PACK_VERSION "2008-12-05"
 !define LANGUAGE_PACK_VERSION_INT "20081205"
 !define DATE_TIME_STAMP "200812050000"
-######################## Added in the extra .0 for 2.2 for constitency 
+######################## Added in the extra .0 for 2.3 for constitency 
 !define SERVER_VERSION_NUMBER "${VERSION}.0.${DATE_TIME_STAMP}"
 !define BASE_VERSION "2.0"
 !define SOURCE_JBOSS_HOME "D:\jboss-4.0.2"  ; location of jboss where lams was deployed
@@ -229,7 +228,7 @@
             call updateLamswww
             
             ; Call specific update method for this version
-            call update22Specific
+            #call update22Specific
         ${endif}
     SectionEnd
     
@@ -488,9 +487,6 @@
         ${elseif} $0 == ${PREVIOUS_VERSION}
             # This is the correct version to update to
             strcpy $IS_UPDATE "1" 
-        ${elseif} $0 == ${PREVIOUS_VERSION_2} ############################# REMOVE AFTER 2.2
-            # This is the correct version to update to
-            strcpy $IS_UPDATE "1" 
         ${else}
             MessageBox MB_OK|MB_ICONSTOP "Your existing version of LAMS ($0) is not compatible with this update. $\r$\n$\r$\nPlease update to LAMS-${PREVIOUS_VERSION} before running this update."
             Abort 
@@ -779,31 +775,7 @@
         Pop $0
         Pop $1
         
-        ########################################################################
-        #THIS SECTION IS FOR 2.2 ONLY REMVE AFTER AND REPLACE WITH COMMENTED SECTION BELOW
-        #NEED TO CHECK FOR 2.1 and 2.1.1 datbase versions
         ${If} $0 != 0
-            Setoutpath "$TEMP\lams\"
-            File "${BUILD_DIR}\checkmysql.class"
-            File "${LIB}\mysql-connector-java-3.1.12-bin.jar"
-            nsExec::ExecToStack '$JDK_DIR\bin\java.exe -cp ".;$TEMP\lams\mysql-connector-java-3.1.12-bin.jar" checkmysql "jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/$DB_NAME?characterEncoding=utf8" $DB_USER $DB_PASS ${PREVIOUS_VERSION_2}'
-            Pop $0
-            Pop $1            
-            ${If} $0 != 0
-                ${StrStr} $3 $1 "UnknownHostException"
-                ${if} $3 == "" 
-                    MessageBox MB_OK|MB_ICONEXCLAMATION "An error occurred whilst checking your mysql configuration $\r$\n$\r$\nError: $1"
-                ${else}
-                    MessageBox MB_OK|MB_ICONEXCLAMATION "An error occurred whilst checking your mysql configuration $\r$\n$\r$\nError: Could not connect to MySql host: $MYSQL_HOST. Please check your database configurations and try again."
-                ${endif} 
-                Abort 
-            ${endif}              
-        ${EndIf}
-        ########################################################################
-        
-        
-        /***************** REMOVE COMMENT AFTER 2.2
-        ${If} $0 != 0
             ${StrStr} $3 $1 "UnknownHostException"
             
             ${if} $3 == "" 
@@ -813,7 +785,7 @@
             ${endif}               
             Abort
         ${EndIf}
-        */
+        *
         
         Delete "$TEMP\lams\checkmysql.class"
         Delete "$TEMP\mysql-connector-java-3.1.12-bin.jar"
@@ -973,204 +945,6 @@
 # CODE USED FOR UPDATER                                                        #
 ################################################################################
 
-# Updates specific to the 2.1 release
-/*
-Function update21Specific
-
-    # Update the log4j.xml and the login-config.xml files
-    SetOutPath "$INSTDIR\jboss-4.0.2\server\default\conf"
-    File /a "${CONF}\log4j.xml"
-    File /a "${CONF}\login-config.xml"
-    
-    Setoutpath "$TEMP\lams\"
-    file "${BUILD_DIR}\Alter21Integration.class"
-    file "${BUILD_DIR}\Alter21Integration$OrgDTO.class"
-    
-    strcpy $1 "jdbc:mysql://$MYSQL_HOST/$DB_NAME?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true"
-    ReadRegStr $2 HKLM "${REG_HEAD}" "dir_repository"
-    ReadRegStr $3 HKLM "${REG_HEAD}" "dir_jdk"
-    # execute the chat update
-    Detailprint '"$3\bin\java.exe" -cp  "lib\mysql-connector-java-3.1.12-bin.jar;." Alter21Integration "$DB_NAME" "$DB_USER" "$DB_PASS" "$1"'
-    nsExec::ExecToStack '"$3\bin\java.exe" -cp  "lib\mysql-connector-java-3.1.12-bin.jar;." Alter21Integration "$DB_NAME" "$DB_USER" "$DB_PASS" "$1"'
-    pop $0
-    pop $1
-    ${if} $0 != '0'
-        Messagebox MB_OK|MB_ICONSTOP "Error while updating integration classes.$\r$\nError: $1"
-        Abort
-    ${endif}
-    
-    
-    setoutpath "$TEMP\lams\"
-    File "${ANT}\update-mysql-ds-xml-2.1.xml"
-    File /a "${TEMPLATES}\mysql-ds.xml"
-    File /a "${BUILD_DIR}\lams-start.exe"
-    
-    FileOpen $0 "$TEMP\lams\update-mysql-ds.properties" w
-    IfErrors 0 +3
-        Detailprint "Problem opening update-mysql-ds.properties to write"
-        goto error
-    
-
-    # convert '\' to '/' for Ant's benefit
-    Push $INSTDIR
-    Push "\"
-    Call StrSlash
-    Pop $3        
-
-    FileWrite $0 "DEPLOYDIR=$3/jboss-4.0.2/server/default/deploy$\r$\n"
-    FileWrite $0 "DB_NAME=$DB_NAME$\r$\n"
-    FileWrite $0 "DB_USER=$DB_USER$\r$\n"
-    FileWrite $0 "DB_PASS=$DB_PASS$\r$\n"
-    FileWrite $0 "MYSQL_HOST=$MYSQL_HOST$\r$\n"
-    FileWrite $0 "MYSQL_PORT=$MYSQL_PORT"
-
-    Fileclose $0
-    IfErrors 0 +2
-        goto error
-
-    # Running the ant scripts to create deploy.xml for the normal tools 
-    strcpy $0 '$INSTDIR\apache-ant-1.6.5\bin\newAnt.bat -logfile $INSTDIR\update-logs\update-mysql-ds.log -buildfile $TEMP\lams\update-mysql-ds-xml-2.1.xml copy-mysql-ds.xml-2.1'
-    DetailPrint $0
-    nsExec::ExecToStack $0
-    Pop $0 ; return code, 0=success, error=fail
-    Pop $1 ; console output
-    DetailPrint "Result: $1"
-    ${if} $0 == "fail"
-    ${orif} $0 == 1
-        goto error
-    ${endif}
-    push "$INSTDIR\update-logs\update-mysql-ds.log"
-    push "FAILED"
-    Call FileSearch
-    Pop $0 #Number of times found throughout
-    Pop $3 #Found at all? yes/no
-    Pop $2 #Number of lines found in
-    StrCmp $3 yes 0 +2
-        goto error
-    
-    goto done
-    error:
-        DetailPrint "Problem while running 2.1 specific update scripts."
-        MessageBox MB_OK|MB_ICONSTOP "Problem while running 2.1 specific update scripts."
-        Abort "LAMS configuration failed."
-    done:
-    
-
-    clearerrors
-    Push "2007" #text to be replaced
-    Push "2008" #replace with
-    Push all #replace all occurrences
-    Push all #replace all occurrences
-    Push "$INSTDIR\index.html" #file to replace in
-    Call AdvReplaceInFile
-    iferrors 0 end 
-        Detailprint "Problem updating index.html"
-    end:
-FunctionEnd
-*/
-
-Function update22Specific
-
-    # update context.xml
-    # update wrapper.conf 
-    # create autopatch table
-    # update jboss-cache and jgroups and jboss-serialization jars
-    # delete jmx console wars once and for all
-    
-    # delete jmx console wars --------------------------------------------------
-    RMDir /r "$INSTDIR\jboss-4.0.2\server\default\deploy\jmx-console.war"
-    RMDir /r "$INSTDIR\jboss-4.0.2\server\default\deploy\management"
-    #---------------------------------------------------------------------------
-    
-    # update jboss-cache and jgroups and jboss-serialization jars --------------
-    SetOutPath "$INSTDIR\jboss-4.0.2\server\default\lib\"
-    File /a "${BASE_PROJECT_DIR}\lams_build\lib\jboss\jboss-cache.jar"
-    File /a "${BASE_PROJECT_DIR}\lams_build\lib\jboss\jgroups.jar"
-    File /a "${BASE_PROJECT_DIR}\lams_build\lib\jboss\jboss-serialization.jar"
-    #---------------------------------------------------------------------------
-    
-    # update context.xml -------------------------------------------------------
-    SetOutPath "$INSTDIR\jboss-4.0.2\server\default\deploy\jbossweb-tomcat55.sar\"
-    File /a "${CONF}\context.xml"
-    #---------------------------------------------------------------------------
-    
-    setoutpath "$TEMP\lams\"
-    File "${ANT}\update-2.2-specific.xml"
-    File /a "${CONF}\wrapper.conf"
-    File /a "${SQL}\addAutoPatchTable.sql"
-
-    #---------------------------------------------------------------------------
-    
-    # set up the ant script ----------------------------------------------------
-    FileOpen $0 "$TEMP\lams\update-2.2-specific.properties" w
-    IfErrors 0 +3
-        Detailprint "Problem opening update-mysql-ds.properties to write"
-        goto error
-    
-    # Add inst dir
-    Push $INSTDIR
-    Push "\"
-    Call StrSlash
-    Pop $3
-    FileWrite $0 "INSTDIR=$3$\r$\n"
-    
-    # Use unix slashes for config in wrapper.conf
-    Push $JDK_DIR
-    Push "\"
-    Call StrSlash
-    Pop $4
-    FileWrite $0 "JDK_DIR_UNIX_SLASH=$4$\r$\n" 
-    
-    # Use unix slashes for config in wrapper.conf
-    Push $TEMP
-    Push "\"
-    Call StrSlash
-    Pop $5
-    FileWrite $0 "TEMP=$5$\r$\n"          
-    
-    FileWrite $0 "db.name=$DB_NAME$\r$\n"
-    FileWrite $0 "db.username=$DB_USER$\r$\n"
-    FileWrite $0 "db.password=$DB_PASS$\r$\n"
-    FileWrite $0 "db.driver=com.mysql.jdbc.Driver$\r$\n"
-    FileWrite $0 "db.url=jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/$${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true$\r$\n"
-
-    Fileclose $0
-    IfErrors 0 +2
-        goto error
-    #---------------------------------------------------------------------------
-    
-    
-    # update wrapper.conf and create autopatch table----------------------------
-    # Running the ant scripts to create deploy.xml for the normal tools 
-    strcpy $0 '$INSTDIR\apache-ant-1.6.5\bin\newAnt.bat -logfile $INSTDIR\update-logs\update-2.2-specific.log -buildfile $TEMP\lams\update-2.2-specific.xml copy-wrapper.conf add-autopatch-table'
-    DetailPrint $0
-    nsExec::ExecToStack $0
-    Pop $0 ; return code, 0=success, error=fail
-    Pop $1 ; console output
-    DetailPrint "Result: $1"
-    ${if} $0 == "fail"
-    ${orif} $0 == 1
-        goto error
-    ${endif}
-    push "$INSTDIR\update-logs\update-mysql-ds.log"
-    push "FAILED"
-    Call FileSearch
-    Pop $0 #Number of times found throughout
-    Pop $3 #Found at all? yes/no
-    Pop $2 #Number of lines found in
-    StrCmp $3 yes 0 +2
-        goto error
-    #---------------------------------------------------------------------------
-
-    goto done
-    error:
-        DetailPrint "Problem while running 2.2 specific update scripts."
-        MessageBox MB_OK|MB_ICONSTOP "Problem while running 2.2 specific update scripts."
-        Abort "LAMS configuration failed."
-    done:
-    
-FunctionEnd
-
 Function setupant
     
     # extract support files to write configuration
@@ -1334,9 +1108,6 @@
     Filewrite $0 "update lams_configuration set config_value='${VERSION}' where config_key='Version';$\r$\n"
     Filewrite $0 "update lams_configuration set config_value='${LANGUAGE_PACK_VERSION}' where config_key='DictionaryDateCreated';$\r$\n"
     
-    ##### 2.2 ONLY ######
-    Filewrite $0 "update lams_learning_library set valid_flag=0 where title='Dimdim';$\r$\n"
-    
     Fileclose $0
     IfErrors 0 +3
         Detailprint "Problem closing updateConfiguration.sql"
@@ -1707,6 +1478,7 @@
 # Creates tool packages for new tools so they can be deployed by the tool deployer
 Function createNewToolPackages
     
+    /*
     ############################## 2.2 TOOLS ###################################
     
     # Adding the daco package --------------------------------------------------
@@ -1808,187 +1580,9 @@
     # --------------------------------------------------------------------------
 
     ############################## 2.2 TOOLS ###################################
-
+    */
 FunctionEnd
 
-
-/*
-# Creates a tool package based on $TOOL_SIG and $TOOL_DIR paramas
-Function createToolPackage
-    SetoutPath "$TEMP\lams\$TOOL_SIG"
-    File "$TOOL_DIR\build.properties"
-    
-    SetoutPath "$TEMP\lams\$TOOL_SIG\build\deploy\"
-    File "$TOOL_DIR\build\lib\*.jar"
-    File "$TOOL_DIR\build\lib\*.war"
-    File "$TOOL_DIR\build\deploy\deploy.xml"
-    
-    SetoutPath "$TEMP\lams\$TOOL_SIG\build\deploy\sql"
-    File /r "$TOOL_DIR\build\deploy\sql\*"
-    
-    SetoutPath "$TEMP\lams\$TOOL_SIG\build\deploy\language"
-    File "$TOOL_DIR\build\deploy\language\*.properties"
-FunctionEnd
-*/
-
-
-# Copying the tool-specific build.property files
-/*
-Function copyToolBuildProperties
-    
-    SetoutPath "$TEMP\lams\lachat11"
-    File "${BASE_PROJECT_DIR}\lams_tool_chat\build.properties"
-    
-    SetoutPath "$TEMP\lams\lafrum11"
-    File "${BASE_PROJECT_DIR}\lams_tool_forum\build.properties"
-    
-    SetoutPath "$TEMP\lams\lamc11"
-    File "${BASE_PROJECT_DIR}\lams_tool_lamc\build.properties"
-    
-    SetoutPath "$TEMP\lams\laqa11"
-    File "${BASE_PROJECT_DIR}\lams_tool_laqa\build.properties"
-    
-    SetoutPath "$TEMP\lams\larsrc11"
-    File "${BASE_PROJECT_DIR}\lams_tool_larsrc\build.properties"
-    
-    SetoutPath "$TEMP\lams\lanb11"
-    File "${BASE_PROJECT_DIR}\lams_tool_nb\build.properties"
-    
-    SetoutPath "$TEMP\lams\lantbk"
-    File "${BASE_PROJECT_DIR}\lams_tool_notebook\build.properties"
-    
-    SetoutPath "$TEMP\lams\lasbmt11"
-    File "${BASE_PROJECT_DIR}\lams_tool_sbmt\build.properties"
-    
-    SetoutPath "$TEMP\lams\lascrb11"
-    File "${BASE_PROJECT_DIR}\lams_tool_scribe\build.properties"
-    
-    SetoutPath "$TEMP\lams\lasurv11"
-    File "${BASE_PROJECT_DIR}\lams_tool_survey\build.properties"
-    
-    SetoutPath "$TEMP\lams\latask10"
-    File "${BASE_PROJECT_DIR}\lams_tool_task\build.properties"
-    
-    SetoutPath "$TEMP\lams\lavote11"
-    File "${BASE_PROJECT_DIR}\lams_tool_vote\build.properties"
-
-FunctionEnd
-
-# Extracting the jars and wars for each tool also copies language files and sql
-Function extractToolJars
-
-    SetoutPath "$TEMP\lams\lachat11\build\deploy\"
-    File "${BASE_PROJECT_DIR}\lams_tool_chat\build\lib\*.jar"
-    File "${BASE_PROJECT_DIR}\lams_tool_chat\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_chat\build\deploy\deploy.xml"
-    SetoutPath "$TEMP\lams\lachat11\build\deploy\sql"
-    File /r "${BASE_PROJECT_DIR}\lams_tool_chat\build\deploy\sql\*"
-    SetoutPath "$TEMP\lams\lachat11\build\deploy\language"
-    File "${BASE_PROJECT_DIR}\lams_tool_chat\build\deploy\language\*.properties"
-    
-    SetoutPath "$TEMP\lams\lafrum11\build\deploy\"
-    File "${BASE_PROJECT_DIR}\lams_tool_forum\build\lib\*.jar"
-    File "${BASE_PROJECT_DIR}\lams_tool_forum\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_forum\build\deploy\deploy.xml"
-    SetoutPath "$TEMP\lams\lafrum11\build\deploy\sql"
-    File /r "${BASE_PROJECT_DIR}\lams_tool_forum\build\deploy\sql\*"
-    SetoutPath "$TEMP\lams\lafrum11\build\deploy\language"
-    File "${BASE_PROJECT_DIR}\lams_tool_forum\build\deploy\language\*.properties"
-    
-    SetoutPath "$TEMP\lams\lamc11\build\deploy\"
-    File "${BASE_PROJECT_DIR}\lams_tool_lamc\build\lib\*.jar"
-    File "${BASE_PROJECT_DIR}\lams_tool_lamc\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_lamc\build\deploy\deploy.xml"
-    SetoutPath "$TEMP\lams\lamc11\build\deploy\sql"
-    File /r  "${BASE_PROJECT_DIR}\lams_tool_lamc\build\deploy\sql\*"
-    SetoutPath "$TEMP\lams\lamc11\build\deploy\language"
-    File "${BASE_PROJECT_DIR}\lams_tool_lamc\build\deploy\language\*.properties"
-    
-    SetoutPath "$TEMP\lams\laqa11\build\deploy\"
-    File "${BASE_PROJECT_DIR}\lams_tool_laqa\build\lib\*.jar"
-    File "${BASE_PROJECT_DIR}\lams_tool_laqa\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_laqa\build\deploy\deploy.xml"
-    SetoutPath "$TEMP\lams\laqa11\build\deploy\sql"
-    File /r  "${BASE_PROJECT_DIR}\lams_tool_laqa\build\deploy\sql\*"
-    SetoutPath "$TEMP\lams\laqa11\build\deploy\language"
-    File "${BASE_PROJECT_DIR}\lams_tool_laqa\build\deploy\language\*.properties"
-    
-    SetoutPath "$TEMP\lams\larsrc11\build\deploy\"
-    File "${BASE_PROJECT_DIR}\lams_tool_larsrc\build\lib\*.jar"
-    File "${BASE_PROJECT_DIR}\lams_tool_larsrc\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_larsrc\build\deploy\deploy.xml"
-    SetoutPath "$TEMP\lams\larsrc11\build\deploy\sql"
-    File /r  "${BASE_PROJECT_DIR}\lams_tool_larsrc\build\deploy\sql\*"
-    SetoutPath "$TEMP\lams\larsrc11\build\deploy\language"
-    File "${BASE_PROJECT_DIR}\lams_tool_larsrc\build\deploy\language\*.properties"
-    
-    SetoutPath "$TEMP\lams\lanb11\build\deploy\"
-    File "${BASE_PROJECT_DIR}\lams_tool_nb\build\lib\*.jar"
-    File "${BASE_PROJECT_DIR}\lams_tool_nb\build\lib\*.war" 
-    File "${BASE_PROJECT_DIR}\lams_tool_nb\build\deploy\deploy.xml"
-    SetoutPath "$TEMP\lams\lanb11\build\deploy\sql"
-    File /r  "${BASE_PROJECT_DIR}\lams_tool_nb\build\deploy\sql\*"
-    SetoutPath "$TEMP\lams\lanb11\build\deploy\language"
-    File "${BASE_PROJECT_DIR}\lams_tool_nb\build\deploy\language\*.properties"   
-
-    SetoutPath "$TEMP\lams\lantbk11\build\deploy\"
-    File "${BASE_PROJECT_DIR}\lams_tool_notebook\build\lib\*.jar"
-    File "${BASE_PROJECT_DIR}\lams_tool_notebook\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_notebook\build\deploy\deploy.xml"
-    SetoutPath "$TEMP\lams\lantbk11\build\deploy\sql"
-    File /r  "${BASE_PROJECT_DIR}\lams_tool_notebook\build\deploy\sql\*"
-    SetoutPath "$TEMP\lams\lantbk11\build\deploy\language"
-    File "${BASE_PROJECT_DIR}\lams_tool_notebook\build\deploy\language\*.properties"
-    
-    SetoutPath "$TEMP\lams\lasbmt11\build\deploy\"
-    File "${BASE_PROJECT_DIR}\lams_tool_sbmt\build\lib\*.jar"
-    File "${BASE_PROJECT_DIR}\lams_tool_sbmt\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_sbmt\build\deploy\deploy.xml"
-    SetoutPath "$TEMP\lams\lasbmt11\build\deploy\sql"
-    File /r "${BASE_PROJECT_DIR}\lams_tool_sbmt\build\deploy\sql\*"
-    SetoutPath "$TEMP\lams\lasbmt11\build\deploy\language"
-    File "${BASE_PROJECT_DIR}\lams_tool_sbmt\build\deploy\language\*.properties"
-    
-    SetoutPath "$TEMP\lams\lascrb11\build\deploy\"
-    File "${BASE_PROJECT_DIR}\lams_tool_scribe\build\lib\*.jar"
-    File "${BASE_PROJECT_DIR}\lams_tool_scribe\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_scribe\build\deploy\deploy.xml"
-    SetoutPath "$TEMP\lams\lascrb11\build\deploy\sql"
-    File /r "${BASE_PROJECT_DIR}\lams_tool_scribe\build\deploy\sql\*"
-    SetoutPath "$TEMP\lams\lascrb11\build\deploy\language"
-    File "${BASE_PROJECT_DIR}\lams_tool_scribe\build\deploy\language\*.properties"
-    
-    SetoutPath "$TEMP\lams\lasurv11\build\deploy\"
-    File "${BASE_PROJECT_DIR}\lams_tool_survey\build\lib\*.jar"
-    File "${BASE_PROJECT_DIR}\lams_tool_survey\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_survey\build\deploy\deploy.xml"
-    SetoutPath "$TEMP\lams\lasurv11\build\deploy\sql"
-    File /r "${BASE_PROJECT_DIR}\lams_tool_survey\build\deploy\sql\*"
-    SetoutPath "$TEMP\lams\lasurv11\build\deploy\language"
-    File "${BASE_PROJECT_DIR}\lams_tool_survey\build\deploy\language\*.properties"
-    
-    SetoutPath "$TEMP\lams\latask10\build\deploy\"
-    File "${BASE_PROJECT_DIR}\lams_tool_task\build\lib\*.jar"
-    File "${BASE_PROJECT_DIR}\lams_tool_task\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_task\build\deploy\deploy.xml"
-    SetoutPath "$TEMP\lams\latask10\build\deploy\sql"
-    File /r "${BASE_PROJECT_DIR}\lams_tool_task\build\deploy\sql\*"
-    SetoutPath "$TEMP\lams\latask10\build\deploy\language"
-    File "${BASE_PROJECT_DIR}\lams_tool_task\build\deploy\language\*.properties"
-    
-    SetoutPath "$TEMP\lams\lavote11\build\deploy\"
-    File "${BASE_PROJECT_DIR}\lams_tool_vote\build\lib\*.jar"
-    File "${BASE_PROJECT_DIR}\lams_tool_vote\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_vote\build\deploy\deploy.xml"
-    SetoutPath "$TEMP\lams\lavote11\build\deploy\sql"
-    File /r "${BASE_PROJECT_DIR}\lams_tool_vote\build\deploy\sql\*"
-    SetoutPath "$TEMP\lams\lavote11\build\deploy\language"
-    File "${BASE_PROJECT_DIR}\lams_tool_vote\build\deploy\language\*.properties"
-    
-    
-FunctionEnd
-*/
-
 Function insertCustomToolContexts
 
     # Running the ant scripts to update web.xmls and manifests
Index: win_installer/updater/templates/mysql-ds.xml
===================================================================
diff -u -r5265f49da852ce0a7e2abbc321dad6ef4ae1863d -rb9e4d29537ce1a8863db9b40e0cc65dbf8274747
--- win_installer/updater/templates/mysql-ds.xml	(.../mysql-ds.xml)	(revision 5265f49da852ce0a7e2abbc321dad6ef4ae1863d)
+++ win_installer/updater/templates/mysql-ds.xml	(.../mysql-ds.xml)	(revision b9e4d29537ce1a8863db9b40e0cc65dbf8274747)
@@ -25,41 +25,4 @@
     <!-- Connections not used after 5 minutes will be closed and removed -->
     <idle-timeout-minutes>5</idle-timeout-minutes>
   </local-tx-datasource>
-
-  <!-- tool-ds datasource for use by Tools -->
-  <local-tx-datasource>
-    <jndi-name>jdbc/tool-ds</jndi-name>
-    <connection-url>jdbc:mysql://@MYSQL_HOST@:@MYSQL_PORT@/@DB_NAME@</connection-url>
-    <driver-class>com.mysql.jdbc.Driver</driver-class>
-    <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
-    <!-- and convert MySQL zero times to null -->
-    <connection-property name="characterEncoding">utf8</connection-property>
-    <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
-    <!-- Set transaction isolation level to match db -->
-    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
-    <user-name>@DB_USER@</user-name>
-    <password>@DB_PASS@</password>
-    <!-- Set minimum adn maximum size of pool -->
-    <max-pool-size>64</max-pool-size>
-    <min-pool-size>0</min-pool-size>
-    <!-- Connections not used after 5 minutes will be closed and removed -->
-    <idle-timeout-minutes>5</idle-timeout-minutes>
-  </local-tx-datasource>
-  
-  <!-- quartz-ds datasource for use by Quartz -->
-  <local-tx-datasource>
-    <jndi-name>jdbc/quartz-ds</jndi-name>
-    <connection-url>jdbc:mysql://@MYSQL_HOST@:@MYSQL_PORT@/@DB_NAME@</connection-url>
-    <driver-class>com.mysql.jdbc.Driver</driver-class>
-    <connection-property name="characterEncoding">utf8</connection-property> 
-    <!-- Set transaction isolation level to match db -->
-    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
-    <user-name>@DB_USER@</user-name>
-    <password>@DB_PASS@</password>
-    <!-- Set minimum adn maximum size of pool -->
-    <max-pool-size>64</max-pool-size>
-    <min-pool-size>0</min-pool-size>
-    <!-- Connections not used after 5 minutes will be closed and removed -->
-    <idle-timeout-minutes>5</idle-timeout-minutes>
-  </local-tx-datasource>
-</datasources>
+</datasources>
\ No newline at end of file