[jboss-cvs] JBossAS SVN: r87078 - in branches/Branch_5_x: server/src/etc/conf and 11 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Apr 9 10:23:48 EDT 2009


Author: bstansberry at jboss.com
Date: 2009-04-09 10:23:47 -0400 (Thu, 09 Apr 2009)
New Revision: 87078

Added:
   branches/Branch_5_x/server/src/etc/conf/all/bootstrap.xml
   branches/Branch_5_x/server/src/etc/conf/all/bootstrap/aop.xml
   branches/Branch_5_x/server/src/etc/conf/all/bootstrap/bindings.xml
   branches/Branch_5_x/server/src/etc/conf/all/bootstrap/classloader.xml
   branches/Branch_5_x/server/src/etc/conf/all/bootstrap/deployers.xml
   branches/Branch_5_x/server/src/etc/conf/all/bootstrap/jmx.xml
   branches/Branch_5_x/server/src/etc/conf/all/bootstrap/logging.xml
   branches/Branch_5_x/server/src/etc/conf/all/bootstrap/vfs.xml
   branches/Branch_5_x/server/src/etc/conf/all/java.policy
   branches/Branch_5_x/server/src/etc/conf/all/jax-ws-catalog.xml
   branches/Branch_5_x/server/src/etc/conf/all/jboss-log4j.xml
   branches/Branch_5_x/server/src/etc/conf/all/jboss-service.xml
   branches/Branch_5_x/server/src/etc/conf/all/login-config.xml
   branches/Branch_5_x/server/src/etc/conf/all/props/
   branches/Branch_5_x/server/src/etc/conf/all/standardjboss.xml
   branches/Branch_5_x/server/src/etc/conf/all/standardjbosscmp-jdbc.xml
   branches/Branch_5_x/server/src/etc/conf/all/xmdesc/
   branches/Branch_5_x/server/src/etc/conf/minimal/
   branches/Branch_5_x/server/src/etc/conf/minimal/bootstrap.xml
   branches/Branch_5_x/server/src/etc/conf/minimal/jboss-service.xml
Removed:
   branches/Branch_5_x/server/src/etc/conf/default/bootstrap-minimal.xml
   branches/Branch_5_x/server/src/etc/conf/default/bootstrap.xml
   branches/Branch_5_x/server/src/etc/conf/default/bootstrap/aop.xml
   branches/Branch_5_x/server/src/etc/conf/default/bootstrap/bindings.xml
   branches/Branch_5_x/server/src/etc/conf/default/bootstrap/classloader.xml
   branches/Branch_5_x/server/src/etc/conf/default/bootstrap/deployers.xml
   branches/Branch_5_x/server/src/etc/conf/default/bootstrap/jmx.xml
   branches/Branch_5_x/server/src/etc/conf/default/bootstrap/logging.xml
   branches/Branch_5_x/server/src/etc/conf/default/bootstrap/vfs.xml
   branches/Branch_5_x/server/src/etc/conf/default/java.policy
   branches/Branch_5_x/server/src/etc/conf/default/jax-ws-catalog.xml
   branches/Branch_5_x/server/src/etc/conf/default/jboss-log4j.xml
   branches/Branch_5_x/server/src/etc/conf/default/jboss-minimal.xml
   branches/Branch_5_x/server/src/etc/conf/default/jboss-service.xml
   branches/Branch_5_x/server/src/etc/conf/default/login-config.xml
   branches/Branch_5_x/server/src/etc/conf/default/props/
   branches/Branch_5_x/server/src/etc/conf/default/standardjboss.xml
   branches/Branch_5_x/server/src/etc/conf/default/standardjbosscmp-jdbc.xml
   branches/Branch_5_x/server/src/etc/conf/default/xmdesc/
   branches/Branch_5_x/testsuite/src/resources/test-configs/cluster-profilesvc-0/conf/
   branches/Branch_5_x/testsuite/src/resources/test-configs/cluster-profilesvc-0/deploy/cluster/farm-deployment-jboss-beans.xml
   branches/Branch_5_x/testsuite/src/resources/test-configs/cluster-profilesvc-1/conf/
   branches/Branch_5_x/testsuite/src/resources/test-configs/cluster-profilesvc-1/deploy/cluster/farm-deployment-jboss-beans.xml
Modified:
   branches/Branch_5_x/build/build-distr.xml
   branches/Branch_5_x/build/build.xml
Log:
JBAS-6757] Reorganize source that populates the server/xxx/conf dir
[JBAS-5552] Use clustered repo in "all" config

Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/build/build-distr.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -518,13 +518,10 @@
 
     <copy file="${_module.output}/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml" tofile="${install.all.deploy}/jmx-invoker-service.xml"/>
 
-    <!-- Copy the default configuration files -->
+    <!-- Copy the "all" configuration files -->
     <mkdir dir="${install.server}/all/conf"/>
     <copy todir="${install.server}/all/conf" filtering="no">
-      <fileset dir="${_module.output}/etc/conf/default">
-        <exclude name="bootstrap-minimal.xml"/>
-        <exclude name="jboss-minimal.xml"/>
-      </fileset>
+      <fileset dir="${_module.output}/etc/conf/all"/>
     </copy>
 
   </target>
@@ -972,6 +969,7 @@
         <include name="hajndi-jboss-beans.xml"/>
         <include name="ha-legacy-jboss-beans.xml"/>
         <include name="timestamps-jboss-beans.xml"/>
+        <include name="farm-deployment-jboss-beans.xml"/>
       </fileset>
     </copy>
     <mkdir dir="${install.server}/all/deploy/cluster/jgroups-channelfactory.sar"/>
@@ -988,21 +986,14 @@
     </copy>
     <mkdir dir="${install.server}/all/deploy-hasingleton"/>
     <mkdir dir="${install.server}/all/deploy/deploy.last"/>
-    <!--
-    <copy todir="${install.server}/all/deploy/deploy.last" filtering="no">
-    <fileset dir="${_module.output}/etc">
-    <include name="farm-jboss-beans.xml"/>
-    </fileset>
-    </copy>
 
-    <!- - Copy the farmed deployables - ->
+    <!-- Copy the farmed deployables -->
     <mkdir dir="${install.server}/all/farm"/>
     <copy todir="${install.server}/all/farm" filtering="no">
     <fileset dir="${_module.output}/etc">
     <include name="cluster-examples-service.xml"/>
     </fileset>
     </copy>
-    -->
 
   </target>
 

Modified: branches/Branch_5_x/build/build.xml
===================================================================
--- branches/Branch_5_x/build/build.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/build/build.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -744,8 +744,10 @@
     </copy>
     <!-- leave the empty default/lib directory there --> 
     <mkdir dir="${install.default.lib}"/>
-    <copy todir="${install.default.conf}"
-          file="${project.root}/server/output/etc/conf/default/jndi.properties" overwrite="true"/>
+  	
+    <copy todir="${install.default.conf}" overwrite="true">
+    	<fileset dir="${project.root}/server/output/etc/conf/default"/>
+	 </copy>
           
     <copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
           file="${project.root}/cluster/output/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>
@@ -770,10 +772,9 @@
         <include name="xmdesc/Log4jService-xmbean.xml"/>          
       </fileset>
     </copy>
-    <copy file="${project.root}/server/output/etc/conf/default/bootstrap-minimal.xml"
-          tofile="${install.minimal.conf}/bootstrap.xml"/>
-    <copy file="${project.root}/server/output/etc/conf/default/jboss-minimal.xml"
-          tofile="${install.minimal.conf}/jboss-service.xml"/>
+    <copy todir="${install.minimal.conf}" overwrite="true">
+      <fileset dir="${project.root}/server/output/etc/conf/minimal"/>
+    </copy>
     <copy file="${project.root}/profileservice/output/resources/hdscanner-jboss-beans.xml" 
           todir="${install.minimal.deploy}" overwrite="true"/>
     <copy todir="${install.minimal.lib}">

Copied: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/aop.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/bootstrap/aop.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/bootstrap/aop.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/bootstrap/aop.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   AOP configuration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <classloader><inject bean="aop-classloader:0.0.0"/></classloader>
+
+   <classloader name="aop-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+      <root>${jboss.lib.url}jboss-aop-asintegration-core.jar</root>
+      <root>${jboss.lib.url}jboss-aop-asintegration-jmx.jar</root>
+      <root>${jboss.lib.url}jboss-aop-asintegration-mc.jar</root>
+      <root>${jboss.lib.url}jboss-aop-deployers.jar</root>
+      <root>${jboss.lib.url}jboss-aop-jboss5.jar</root>
+   </classloader>
+
+   <!-- Integration -->
+   <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
+   
+   <bean name="AOPClassPoolFactory" class="org.jboss.aop.classpool.jbosscl.JBossClDelegatingClassPoolFactory">
+      <constructor>
+         <parameter><inject bean="AOPClassLoaderScopingPolicy" property="registry"/></parameter>
+         <parameter><inject bean="AOPRegisterModuleCallback"/></parameter>
+      </constructor>
+   </bean>
+
+   <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
+      <property name="classPoolFactory"><inject bean="AOPClassPoolFactory"/></property>
+      <property name="aopClassLoaderScopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
+   </bean>
+
+   <bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
+      <property name="managerBean">AspectManager</property>
+      <property name="managerProperty">aspectManager</property>
+   </bean>
+
+   <!-- bean name="AOPBootstrap" class="org.jboss.aop.asintegration.jboss5.AOPBootstrap" -->
+      <!--  This one lives in AS 5 source tree -->
+      <!-- property name="policy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
+       <property name="manager"><inject bean="AspectManager" property="aspectManager"/></property>
+   </bean-->
+
+   <bean name="AOPRegisterModuleCallback" class="org.jboss.aop.asintegration.jboss5.RegisterModuleCallback">
+      <!-- classloader><null/></classloader -->
+      <incallback method="addModule" state="Installed"/>
+      <uncallback method="removeModule" state="Installed"/>
+   </bean>
+   <!--
+      Valid values for the AspectManager bean for use with enableTransformer=true are:
+      * org.jboss.aop.deployers.AspectManagerJDK5 - works with the -javaagent:pluggable-instrumentor.jar switch
+      * org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and the -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor switch
+   -->
+   <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
+      <constructor>
+         <parameter><![CDATA[
+	         <aop>
+			      <aspect name="mainDeployer" class="org.jboss.profileservice.aop.MainDeployerAspect"/>
+					   <bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployment.MainDeployer}->process(..))">
+				      <advice name="process" aspect="mainDeployer"/>
+				   </bind>
+					<aspect name="persist" class="org.jboss.profileservice.aop.PersistAspect"/>
+					<bind pointcut="execution(* $instanceof{org.jboss.managed.api.ManagedProperty}->setValue(..))">
+				      <advice name="setValue" aspect="persist"/>
+				   </bind>
+				</aop>]]>
+	      </parameter>
+      </constructor>
+
+      <property name="jbossIntegration"><inject bean="AOPJBossIntegration"/></property>
+
+      <property name="enableLoadtimeWeaving">false</property>
+      <!-- only relevant when EnableLoadtimeWeaving is true.
+           When transformer is on, every loaded class gets
+           transformed.  If AOP can't find the class, then it
+           throws an exception.  Sometimes, classes may not have
+           all the classes they reference.  So, the Suppressing
+           is needed.  (i.e. Jboss cache in the default configuration -->
+      <property name="suppressTransformationErrors">true</property>
+      <property name="prune">true</property>
+      <property name="include">org.jboss.test., org.jboss.injbossaop.</property>
+      <property name="exclude">org.jboss.</property>
+      <!-- This avoids instrumentation of hibernate cglib enhanced proxies
+      <property name="ignore">*$$EnhancerByCGLIB$$*</property> -->
+      <property name="optimized">true</property>
+      <property name="verbose">false</property>
+      <!--
+         Available choices for this attribute are:
+            org.jboss.aop.instrument.ClassicInstrumentor (default)
+            org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
+       <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
+      -->
+	  <!-- 
+		By default the deployment of the aspects contained in 
+		../deployers/jboss-aop-jboss5.deployer/base-aspects.xml
+		are not deployed. To turn on deployment uncomment this property
+	  <property name="useBaseXml">true</property>
+	  -->
+   </bean>
+
+</deployment>


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/aop.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/bindings.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/bootstrap/bindings.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/bootstrap/bindings.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/bootstrap/bindings.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <classloader><inject bean="bindings-classloader:0.0.0"/></classloader>
+
+   <classloader name="bindings-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+      <root>${jboss.common.lib.url}jboss-bindingservice.jar</root>
+   </classloader>
+
+   <bean name="ServiceBindingManager" class="org.jboss.services.binding.ServiceBindingManager">
+
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.system:service=ServiceBindingManager", exposedInterface=org.jboss.services.binding.ServiceBindingManagerMBean.class, registerDirectly=true)</annotation>
+            
+      <constructor>
+         <!-- The name of the set of bindings to use for this server -->
+         <parameter>${jboss.service.binding.set:ports-default}</parameter>
+
+         <!-- The named sets of bindings -->
+         <parameter>
+            <bean name="ServiceBindingStore" class="org.jboss.services.binding.impl.PojoServiceBindingStore">
+
+               <!-- Base bindings that are used to create bindings for each set -->
+               <property name="standardBindings"><inject bean="StandardBindings"/></property>
+               
+               <!-- The sets of bindings -->
+               <property name="serviceBindingSets">
+                  <set>
+                     <inject bean="PortsDefaultBindings"/>
+                     <inject bean="Ports01Bindings"/>
+                     <inject bean="Ports02Bindings"/>
+                     <inject bean="Ports03Bindings"/>
+                  </set>
+               </property>
+            </bean>
+         </parameter>
+      </constructor>
+
+   </bean>
+
+   <!-- The ports-default bindings are obtained by taking the base bindings and adding 0 to each port value  -->
+   <bean name="PortsDefaultBindings"  class="org.jboss.services.binding.impl.ServiceBindingSet">
+      <constructor>
+         <!--  The name of the set -->
+         <parameter>ports-default</parameter>
+         <!-- Default host name -->
+         <parameter>${jboss.bind.address}</parameter>
+         <!-- The port offset -->
+         <parameter>0</parameter>
+         <!-- Set of bindings to which the "offset by X" approach can't be applied -->
+         <parameter><null/></parameter>
+      </constructor>
+   </bean>
+
+   <!-- The ports-01 bindings are obtained by taking the base bindings and adding 100 to each port value -->
+   <bean name="Ports01Bindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
+      <constructor>
+         <!--  The name of the set -->
+         <parameter>ports-01</parameter>
+         <!-- Default host name -->
+         <parameter>${jboss.bind.address}</parameter>
+         <!-- The port offset -->
+         <parameter>100</parameter>
+         <!-- Set of bindings to which the "offset by X" approach can't be applied -->
+         <parameter><null/></parameter>
+      </constructor>
+   </bean>
+
+   <!-- The ports-02 bindings are obtained by taking ports-default and adding 200 to each port value -->
+   <bean name="Ports02Bindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
+      <constructor>
+         <!--  The name of the set -->
+         <parameter>ports-02</parameter>
+         <!-- Default host name -->
+         <parameter>${jboss.bind.address}</parameter>
+         <!-- The port offset -->
+         <parameter>200</parameter>
+         <!-- Set of bindings to which the "offset by X" approach can't be applied -->
+         <parameter><null/></parameter>
+      </constructor>
+   </bean>
+
+   <!-- The ports-03 bindings are obtained by taking ports-default and adding 300 to each port value -->
+   <bean name="Ports03Bindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
+      <constructor>
+         <!--  The name of the set -->
+         <parameter>ports-03</parameter>
+         <!-- Default host name -->
+         <parameter>${jboss.bind.address}</parameter>
+         <!-- The port offset -->
+         <parameter>300</parameter>
+         <!-- Set of bindings to which the "offset by X" approach can't be applied -->
+         <parameter><null/></parameter>
+      </constructor>
+   </bean>
+
+   <!-- Base binding metadata that ServiceBindingStore uses to create bindings for each set -->
+   <bean name="StandardBindings" class="java.util.HashSet">
+      <constructor>
+         <parameter class="java.util.Collection">
+            <set elementClass="org.jboss.services.binding.ServiceBindingMetadata">
+            <!-- ********************* conf/jboss-service.xml ****************** -->
+
+            <!-- Naming Service -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss:service=Naming</property>
+               <property name="bindingName">Port</property>
+               <property name="port">1099</property>
+            </bean>
+
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss:service=Naming</property>
+               <property name="bindingName">RmiPort</property>
+               <property name="port">1098</property>
+            </bean>
+
+            <!-- Remote classloading service -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss:service=WebService</property>
+               <property name="port">8083</property>
+            </bean>
+
+            <!-- Remoting Connector -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">UnifiedInvokerConnector</property>
+               <property name="port">4446</property>
+            </bean>
+            
+            <!-- Used to create a multihome Remoting server.   See -->
+            <!-- deploy/remoting-jboss-beans.xml for more details. -->
+            <!--bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">UnifiedInvokerConnector:bindingHome1</property>
+               <parameter>192.168.2.2</property>
+               <property name="port">7777</property>
+            </bean-->
+            
+            <!-- Used to create a multihome Remoting server.   See -->
+            <!-- deploy/remoting-jboss-beans.xml for more details. -->
+            <!--bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">UnifiedInvokerConnector:bindingHome2</property>
+               <parameter>10.11.12.238</property>
+               <property name="port">8888</property>
+            </bean-->
+
+            <!-- ********************* deploy/legacy-invokers-service.xml ****************** -->
+
+            <!-- RMI/JRMP invoker -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss:service=invoker,type=jrmp</property>
+               <property name="port">4444</property>
+            </bean>
+
+            <!-- Pooled invoker -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss:service=invoker,type=pooled</property>
+               <property name="port">4445</property>
+            </bean>
+
+            <!-- ********************* deploy/cluster/hajndi-service.xml ****************** -->
+
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss:service=HAJNDI</property>
+               <property name="bindingName">Port</property>
+               <property name="port">1100</property>
+            </bean>
+
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss:service=HAJNDI</property>
+               <property name="bindingName">RmiPort</property>
+               <property name="port">1101</property>
+            </bean>
+
+            <!-- ********************* deploy/cluster/ha-legacy-service.xml ****************** -->
+
+            <!-- HA RMI/JRMP invoker -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss:service=invoker,type=jrmpha</property>
+               <property name="port">4447</property>
+            </bean>
+
+            <!-- HA Pooled invoker -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss:service=invoker,type=pooledha</property>
+               <property name="port">4448</property>
+            </bean>
+
+            <!-- ********************* deploy/iiop-service.xml ****************** -->
+
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss:service=CorbaORB</property>
+               <property name="port">3528</property>
+            </bean>
+
+            <!-- ********************* deploy/snmp-adaptor.sar **************** -->
+
+            <!-- Trap receiver that acts as an SNMP Manager -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss.jmx:name=SnmpAgent,service=trapd,type=logger</property>
+               <property name="port">1162</property>
+            </bean>
+
+            <!-- The SNMP adaptor MBean -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss.jmx:name=SnmpAgent,service=snmp,type=adaptor</property>
+               <property name="port">1161</property>
+            </bean>
+
+            <!-- ********************* deploy/jmx-remoting.sar **************** -->
+
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss.remoting:service=JMXConnectorServer,protocol=rmi</property>
+               <property name="port">1090</property>
+            </bean>
+
+            <!-- ********************* deploy/ejb3-connectors-service.xml **************** -->
+
+            <!-- EJB3 wants to have the service create its own ServiceBinding object
+                 dynamically.  See the value-factory usage in deploy/ejb3-connectors-service.xml -->
+
+
+            <!-- ********************* deploy/jbossweb.sar **************** -->
+            <!-- ********************* deploy/httpha-invoker.sar **************** -->
+
+            <!--
+                JBoss Web server.xml configuration.
+
+                Same binding config can be used by the following services, or really
+                anything else that needs to point to the JBoss Web HTTP connector
+                but doesn't need an XSL Transform
+
+                jboss:service=invoker,type=http
+                jboss:service=invoker,type=http,target=Naming
+                jboss:service=invoker,type=http,target=Naming,readonly=true
+                jboss:service=invoker,type=httpHA
+                jboss:service=invoker,type=http,target=HAJNDI
+                jboss.ws:service=ServiceEndpointManager
+            -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss.web:service=WebServer</property>
+               <property name="port">8080</property>
+
+               <!--
+                   Inject a XSLT transform configuration (see below) that describes
+                   how to transform server.xml
+                   If the binding value request doesn't require an XSL Transform, this config
+                   will be ignored.
+               -->
+               <property name="serviceBindingValueSourceConfig"><inject bean="JBossWebConnectorXSLTConfig"/></property>
+            </bean>
+
+            <!-- For services like those listed above that need to know the
+                 port of the HTTPS connector -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss.web:service=WebServer</property>
+               <property name="bindingName">HttpsConnector</property>
+               <property name="port">8443</property>
+            </bean>
+
+            <!-- ********************* deploy/messaging/remoting-bisocket-service.xml ********************** -->
+
+            <!-- Standard JBM bisocket connector -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss.messaging:service=Connector,transport=bisocket</property>
+               <property name="port">4457</property>
+            </bean>
+
+            <!-- ********************* deploy/transaction-jboss-beans.xml ********************** -->
+
+            <!-- JBossTS Recovery Manager -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+                <property name="serviceName">TransactionManager</property>
+                <property name="bindingName">recoveryManager</property>
+                <property name="port">4712</property>
+            </bean>
+
+            <!-- JBossTS Transaction Status Manager -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+                <property name="serviceName">TransactionManager</property>
+                <property name="bindingName">transactionStatusManager</property>
+                <property name="port">4713</property>
+            </bean>
+
+            <!-- JBossTS SocketProcessId.  The address part is ignored,
+                it will always use localhost/127.0.0.1. -->
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+                <property name="serviceName">TransactionManager</property>
+                <property name="bindingName">socketProcessId</property>
+                <property name="port">4714</property>
+            </bean>
+
+
+            <!-- ********************* deploy/hsqldb-ds.xml **************** -->
+
+            <!-- Commented out as tcp/ip access to Hypersonic is not enabled by default -->
+            <!--
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss:service=Hypersonic</property>
+               <property name="port">1701</property>
+            </bean>
+            -->
+
+            <!-- ********************* JBoss MQ **************** -->
+
+            <!-- Commented out as JBoss MQ is not installed by default
+                 If you uncomment this and also use jboss.mq:service=InvocationLayer,type=HTTP,
+                 configure the http invocation layer using the jboss.web:service=WebServer binding above
+             -->
+            <!--
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss.mq:service=InvocationLayer,type=UIL2</property>
+               <property name="port">8093</property>
+            </bean>
+            -->
+         </set>
+         </parameter>
+      </constructor>
+   </bean>
+
+   <!-- Conversion of selected bindings into system properties -->
+   <bean name="SystemPropertyBinder" class="org.jboss.services.binding.SystemPropertyBinder">
+
+      <constructor>
+         <parameter>
+            <set>
+               <!-- JBM's remoting connector -->
+               <bean class="org.jboss.services.binding.SystemPropertyBinding">
+                  <constructor>
+                     <parameter>jboss.messaging.connector.bisocket.port</parameter>
+                     <parameter class="int">
+                        <value-factory bean="ServiceBindingManager" method="getIntBinding"
+                                       parameter="jboss.messaging:service=Connector,transport=bisocket"/>
+                     </parameter>
+                  </constructor>
+               </bean>
+            </set>
+         </parameter>
+      </constructor>
+
+   </bean>
+
+   <!-- XSL Transform to apply to server.xml -->
+   <bean name="JBossWebConnectorXSLTConfig"
+         class="org.jboss.services.binding.impl.XSLTServiceBindingValueSourceConfig">
+
+      <constructor>
+          <parameter><![CDATA[
+   <xsl:stylesheet
+         xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+
+     <xsl:output method="xml" />
+     <xsl:param name="port"/>
+
+     <xsl:variable name="portAJP" select="$port - 71"/>
+     <xsl:variable name="portHttps" select="$port + 363"/>
+
+     <xsl:template match="/">
+       <xsl:apply-templates/>
+     </xsl:template>
+
+      <xsl:template match = "Connector">
+         <Connector>
+            <xsl:for-each select="@*">
+            <xsl:choose>
+               <xsl:when test="(name() = 'port' and . = '8080')">
+                  <xsl:attribute name="port"><xsl:value-of select="$port" /></xsl:attribute>
+               </xsl:when>
+               <xsl:when test="(name() = 'port' and . = '8009')">
+                  <xsl:attribute name="port"><xsl:value-of select="$portAJP" /></xsl:attribute>
+               </xsl:when>
+               <xsl:when test="(name() = 'redirectPort')">
+                  <xsl:attribute name="redirectPort"><xsl:value-of select="$portHttps" /></xsl:attribute>
+               </xsl:when>
+               <xsl:when test="(name() = 'port' and . = '8443')">
+                  <xsl:attribute name="port"><xsl:value-of select="$portHttps" /></xsl:attribute>
+               </xsl:when>
+               <xsl:otherwise>
+                  <xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>
+               </xsl:otherwise>
+            </xsl:choose>
+            </xsl:for-each>
+            <xsl:apply-templates/>
+         </Connector>
+      </xsl:template>
+
+     <xsl:template match="*|@*">
+       <xsl:copy>
+         <xsl:apply-templates select="@*|node()"/>
+       </xsl:copy>
+     </xsl:template>
+   </xsl:stylesheet>
+   ]]>
+          </parameter>
+      </constructor>
+   </bean>
+
+</deployment>


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/bindings.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/classloader.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/bootstrap/classloader.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/bootstrap/classloader.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/bootstrap/classloader.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   The core classloading system
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <classloader><inject bean="bootstrap-classloader:0.0.0"/></classloader>
+
+   <!--
+      The classloader implementation
+   -->
+   <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
+      <classloader><null/></classloader>
+      <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
+   </bean>
+
+   <!-- 
+      ClassLoader management and resolution
+   -->
+   <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
+      <classloader><null/></classloader>
+      <incallback method="addModule" state="Configured"/>
+      <uncallback method="removeModule" state="Configured"/>
+   </bean>
+
+   <classloader name="bootstrap-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+      <!-- System -->
+      <root>${jboss.lib.url}jboss-system.jar</root>
+   </classloader>
+   
+</deployment>


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/classloader.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/deployers.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/bootstrap/deployers.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/bootstrap/deployers.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/bootstrap/deployers.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   The base deployers
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <classloader><inject bean="deployers-classloader:0.0.0"/></classloader>
+
+   <classloader name="deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+      <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root>
+      <root>${jboss.lib.url}jboss-deployers-core.jar</root>
+      <root>${jboss.lib.url}jboss-deployers-client-spi.jar</root>
+      <root>${jboss.lib.url}jboss-deployers-client.jar</root>
+      <root>${jboss.lib.url}jboss-deployers-structure-spi.jar</root>
+      <root>${jboss.lib.url}jboss-deployers-spi.jar</root>
+      <root>${jboss.lib.url}jboss-deployers-impl.jar</root>
+      <root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root>
+      <root>${jboss.lib.url}jboss-deployers-vfs.jar</root>
+     <!-- Bean annotation handling -->
+      <root>${jboss.lib.url}jboss-dependency.jar</root>
+      <root>${jboss.lib.url}jboss-kernel.jar</root>
+
+      <!-- JAXB impl here, api is in endorsed -->
+      <root>${jboss.lib.url}jaxb-impl.jar</root>
+      <!-- STAX2 impl here, api is in endorsed -->
+      <root>${jboss.lib.url}wstx.jar</root>
+   </classloader>
+
+  <!-- use legacy ordering -->
+   <bean name="topContextComparator">
+     <constructor factoryClass="org.jboss.system.deployers.LegacyDeploymentContextComparator" factoryMethod="getInstance"/>
+   </bean>
+
+   <!-- MetaValueFactory -->
+   <bean name="MetaValueFactory" >
+      <constructor factoryClass="org.jboss.metatype.api.values.MetaValueFactory" factoryMethod="getInstance"/>      
+   </bean>
+   <!-- The ManagedObjectFactory -->
+   <bean name="ManagedObjectFactory">
+      <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/>
+      <!-- Accept any implementor of InstanceClassFactory -->
+      <incallback method="addInstanceClassFactory"/>
+      <uncallback method="removeInstanceClassFactory"/>
+     <!-- Accept any ManagedObjectDefinition -->
+      <incallback method="addManagedObjectDefinition"/>
+      <uncallback method="removeManagedObjectDefinition"/>
+      <property name="metaValueFactory"><inject bean="MetaValueFactory"/></property>
+   </bean>
+   <!-- The ManagedObjectCreator implementation -->
+   <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
+      <property name="mof"><inject bean="ManagedObjectFactory"/></property>
+   </bean>
+
+   <!-- The MainDeployer -->
+   <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+      <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
+      <property name="deployers"><inject bean="Deployers"/></property>
+      <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
+      <property name="comparator"><inject bean="topContextComparator"/></property>
+   </bean>
+
+   <!-- The ManagedDeploymentCreator implementation that supports mapping
+      attachment types to ManagedDeployment#getTypes
+   -->
+   <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.TypedManagedDeploymentCreator" />
+
+   <!-- ModificationType structure processor -->
+   <bean name="ModificationTypeStructureProcessor" class="org.jboss.deployers.vfs.plugins.structure.modify.ModificationTypeStructureProcessor">
+     <incallback method="addMatcher"/>
+     <uncallback method="removeMatcher"/>
+   </bean>
+
+   <!-- The holder for deployers that determine structure -->
+   <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
+      <property name="structureBuilder">
+         <!-- The consolidator of the structure information -->
+         <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder">
+           <property name="structureProcessor"><inject bean="ModificationTypeStructureProcessor"/></property>
+         </bean>
+      </property>
+      <!-- Accept any implementor of structure deployer -->
+      <incallback method="addDeployer"/>
+      <uncallback method="removeDeployer"/>
+   </bean>
+
+   <!-- The holder for deployers that do real deployment -->
+   <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.deployment:service=DeployersImpl", exposedInterface=org.jboss.deployers.plugins.deployers.DeployersImplMBean.class, registerDirectly=true)</annotation>
+      <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+      <!-- Accept any implementor of deployer -->
+      <incallback method="addDeployer"/>
+      <uncallback method="removeDeployer"/>
+      <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
+   </bean>
+
+   <!-- A declared structure descriptor deployer -->
+   <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
+
+    <!-- JAR Structure -->
+    <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
+       <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop -->
+       <constructor>
+          <parameter>
+             <set elementClass="java.lang.String">
+                <value>.zip</value>
+                <value>.ear</value>
+                <value>.jar</value>
+                <value>.rar</value>
+                <value>.war</value>
+                <value>.sar</value>
+                <value>.har</value>
+                <value>.aop</value>
+                <value>.deployer</value>
+                <value>.beans</value>
+             </set>
+          </parameter>
+       </constructor>
+       <property name="candidateStructureVisitorFactory">
+          <!-- Any file that is not an ordinary directory is a candidate -->
+          <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
+             <!-- A filter to exclude some obvious non-subdeployments -->
+             <property name="filter">
+                <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+                   <constructor><parameter>
+                      <list elementClass="java.lang.String">
+                         <!-- Exclude class files as subdeployments -->
+                         <value>.class</value>
+                      </list>
+                   </parameter></constructor>
+                </bean>
+             </property>
+          </bean>
+       </property>
+    </bean>
+
+    <!-- File Structure -->
+    <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
+       <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
+       <constructor>
+          <parameter>
+             <set elementClass="java.lang.String">
+                <value>-service.xml</value>
+                <value>-beans.xml</value>
+                <value>-ds.xml</value>
+                <value>-aop.xml</value>
+             </set>
+          </parameter>
+       </constructor>
+    </bean>
+
+    <!-- Old AOP deployment 
+    <bean name="AspectAppParsingDeployer" class="org.jboss.aop.asintegration.jboss5.AspectAppParsingDeployer"/>
+    <bean name="AspectDeployer" class="org.jboss.aop.asintegration.jboss5.AspectDeployer">
+       <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+   </bean>
+   -->
+
+   <bean name="AOPXMLMetaDataParserDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+      <constructor>
+         <parameter>org.jboss.aop.microcontainer.beans.metadata.AOPDeployment</parameter>
+      </constructor>
+      <property name="suffix">-aop.xml</property>
+   </bean>
+   <bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer">
+      <constructor>
+         <parameter><inject bean="AOPXMLMetaDataParserDeployer" property="relativeOrder"/></parameter>
+      </constructor>
+   </bean>
+   <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer">
+      <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+   </bean>
+   <bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer">
+      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+      <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+   </bean>
+   <bean name="BeansDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.BeansDeploymentAopMetaDataDeployer">
+      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+      <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+   </bean>
+
+   <!-- POJO Deployment -->
+  
+   <bean name="CoreBeanAnnotationAdapterFactory">
+      <constructor factoryClass="org.jboss.kernel.plugins.annotations.BeanAnnotationAdapterFactory" factoryMethod="getInstance"/>
+   </bean>
+
+   <bean name="CoreBeanAnnotationAdapter">
+      <constructor factoryMethod="getBeanAnnotationAdapter">
+        <factory bean="CoreBeanAnnotationAdapterFactory"/>
+      </constructor>
+      <incallback method="addAnnotationPlugin"/>
+      <uncallback method="removeAnnotationPlugin"/>
+   </bean>
+
+   <bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF">
+      <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
+      <property name="delegateICF"><inject bean="ManagedObjectFactory" property="defaultInstanceFactory"/></property>
+   </bean>
+   <bean name="KernelDeploymentManagedObjectCreator" class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator">
+      <constructor><parameter><inject bean="ManagedObjectFactory"/></parameter></constructor>
+   </bean>
+   <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
+      <property name="suffix">jboss-beans.xml</property>
+   </bean>
+   <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer">
+      <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+         <parameter>
+            <value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
+         </parameter>
+         <parameter>
+            <value>beans</value>
+         </parameter>
+      </install>
+      <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+         <parameter>
+            <value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
+         </parameter>        
+      </uninstall>
+      <property name="mgtObjectCreator"><inject bean="KernelDeploymentManagedObjectCreator"/></property>
+   </bean>
+   <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
+      <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+   </bean>
+
+   <!-- JMX Deployment -->
+   <bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF">
+      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+      <property name="controller"><inject bean="JMXKernel" property="serviceController"/></property>
+   </bean>
+   <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer"/>
+   <bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer"/>
+   <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer"/>
+   <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
+       <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
+   </bean>
+
+   <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+      <constructor>
+         <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
+      </constructor>
+      <property name="name">jboss-classloading.xml</property>
+      <property name="buildManagedObject">true</property>
+   </bean>
+   <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
+      <property name="defaultMetaData">
+         <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
+      </property>
+   </bean>
+   <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/>
+   <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
+   <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
+      <property name="classLoading"><inject bean="ClassLoading"/></property>
+   </bean>
+   <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
+      <property name="classLoading"><inject bean="ClassLoading"/></property>
+      <property name="system"><inject bean="ClassLoaderSystem"/></property>
+   </bean>
+   
+</deployment>


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/deployers.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/jmx.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/bootstrap/jmx.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/bootstrap/jmx.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/bootstrap/jmx.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   The JMX Subsystem
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <classloader><inject bean="jmx-classloader:0.0.0"/></classloader>
+
+   <classloader name="jmx-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+      <root>${jboss.lib.url}jboss-j2se.jar</root>
+      <root>${jboss.lib.url}jboss-mbeans.jar</root>
+      <root>${jboss.lib.url}jboss-jmx.jar</root>
+      <root>${jboss.lib.url}jboss-system-jmx.jar</root>
+      <root>${jboss.lib.url}dom4j.jar</root>
+   </classloader>
+
+   <bean name="ServerInfo" class="org.jboss.system.server.ServerInfo">
+      <alias>jboss.system:type=ServerInfo</alias>
+   </bean>
+
+   <!-- The legacy JMX kernel -->
+   <bean name="JMXKernel" class="org.jboss.system.server.jmx.JMXKernel">
+      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+      <property name="serverImpl"><inject bean="JBossServer"/></property>
+      <property name="serverInfo"><inject bean="ServerInfo"/></property>
+   </bean>
+   
+   <!-- Support for @JMX -->
+   <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+               name="JMXRegistrationAdvice"
+               class="org.jboss.system.microcontainer.jmx.ServiceControllerRegistrationLifecycleCallback"
+               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+               manager-bean="AspectManager"
+               manager-property="aspectManager">
+      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+   </lifecycle-configure>
+   <lifecycle-create xmlns="urn:jboss:aop-beans:1.0"
+               name="JMXCreateDestroyAdvice"
+               class="org.jboss.system.microcontainer.jmx.ServiceControllerCreateDestroyLifecycleCallback"
+               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+               manager-bean="AspectManager"
+               manager-property="aspectManager">
+      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+   </lifecycle-create>
+   <lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
+               name="JMXStartStopAdvice"
+               class="org.jboss.system.microcontainer.jmx.ServiceControllerStartStopLifecycleCallback"
+               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+               manager-bean="AspectManager"
+               manager-property="aspectManager">
+      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+   </lifecycle-install>
+
+	<!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
+	<bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
+	   <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+	   <property name="aspectManager"><inject bean="AspectManager" property="delegate"/></property>
+	</bean>
+
+</deployment>


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/jmx.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/logging.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/bootstrap/logging.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/bootstrap/logging.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/bootstrap/logging.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   The Logging Subsystem
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+    <bean name="LogBridgeHandler" class="org.jboss.logbridge.LogBridgeHandler"/>
+
+</deployment>
\ No newline at end of file


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/logging.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 

Copied: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/vfs.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/bootstrap/vfs.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/bootstrap/vfs.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/bootstrap/vfs.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   The JBossVFS initializer configuration.
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <bean name="VFSCache">
+    <constructor factoryClass="org.jboss.virtual.spi.cache.VFSCacheFactory" factoryMethod="getInstance">
+      <!-- Use the CombinedVFSCache implementation -->
+      <parameter>org.jboss.virtual.plugins.cache.CombinedVFSCache</parameter>
+    </constructor>
+    <start ignored="true"/>
+    <property name="permanentRoots">
+      <map keyClass="java.net.URL" valueClass="org.jboss.virtual.spi.ExceptionHandler">
+        <entry>
+          <key>${jboss.lib.url}</key>
+          <value><null/></value>
+        </entry>
+        <entry>
+          <key>${jboss.common.lib.url}</key>
+          <value><inject bean="VfsNamesExceptionHandler"/></value>
+        </entry>
+        <entry>
+          <key>${jboss.server.lib.url}</key>
+          <value><inject bean="VfsNamesExceptionHandler"/></value>
+        </entry>
+        <entry>
+          <key>${jboss.server.home.url}deploy</key>
+          <value><inject bean="VfsNamesExceptionHandler"/></value>
+        </entry>
+      </map>
+    </property>
+    <property name="realCache">
+      <bean class="org.jboss.virtual.plugins.cache.IterableTimedVFSCache"/>
+    </property>
+  </bean>
+
+  <bean name="VfsNamesExceptionHandler" class="org.jboss.virtual.plugins.context.helpers.NamesExceptionHandler">
+    <constructor>
+      <parameter class="java.lang.String">sqljdbc.jar</parameter>
+    </constructor>
+  </bean>
+
+</deployment>


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/vfs.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/bootstrap.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/bootstrap.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/bootstrap.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/bootstrap.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   The list of URLs for mc beans to load during bootstrap.
+   $Id$
+-->
+<bootstrap xmlns="urn:jboss:bootstrap:1.0">
+
+   <url>bootstrap/logging.xml</url>
+   <url>bootstrap/vfs.xml</url>
+   <url>bootstrap/classloader.xml</url>
+   <url>bootstrap/aop.xml</url>
+   <url>bootstrap/jmx.xml</url>
+   <url>bootstrap/deployers.xml</url>
+   <url>bootstrap/bindings.xml</url>
+   <url>bootstrap/profile.xml</url>
+
+</bootstrap>


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/bootstrap.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/java.policy (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/java.policy)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/java.policy	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/java.policy	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,4 @@
+grant {
+        // Allow everything for now
+        permission java.security.AllPermission;
+};


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/java.policy
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: branches/Branch_5_x/server/src/etc/conf/all/jax-ws-catalog.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/jax-ws-catalog.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/jax-ws-catalog.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/jax-ws-catalog.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,85 @@
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  
+  <system systemId="http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" uri="../../../docs/schema/application_1_4.xsd"/>
+  <system systemId="http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" uri="../../../docs/schema/application-client_1_4.xsd"/>
+  <system systemId="http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd" uri="../../../docs/schema/connector_1_5.xsd"/>
+  <system systemId="http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" uri="../../../docs/schema/ejb-jar_2_1.xsd"/>
+  <system systemId="http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd" uri="../../../docs/schema/j2ee_1_4.xsd"/>
+  <system systemId="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" uri="../../../docs/schema/web-app_2_4.xsd"/>
+  <system systemId="http://schemas.xmlsoap.org/soap/encoding/" uri="../../../docs/schema/soap-encoding_1_1.xsd"/>
+  <system systemId="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd" uri="../../../docs/schema/j2ee_web_services_client_1_1.xsd"/>
+  <system systemId="http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" uri="../../../docs/schema/j2ee_web_services_1_1.xsd"/>
+  <system systemId="http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd" uri="../../../docs/schema/j2ee_jaxrpc_mapping_1_1.xsd"/>
+  <system systemId="http://www.w3.org/2001/xml.xsd" uri="../../../docs/schema/xml.xsd"/>
+  <system systemId="http://www.w3.org/2005/05/xmlmime" uri="../../../docs/schema/xml-media-types.xsd"/>
+  
+  <!--  ejb related -->
+  <public publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN" uri="../../../docs/dtd/ejb-jar.dtd"/>
+  <public publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" uri="../../../docs/dtd/ejb-jar_2_0.dtd"/>
+  <!--  ear stuff -->
+  <public publicId="-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN" uri="../../../docs/dtd/application_1_2.dtd"/>
+  <public publicId="-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" uri="../../../docs/dtd/application_1_3.dtd"/>
+  <public publicId="-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN" uri="../../../docs/dtd/application-client_1_3.dtd"/>
+  <!--  connector descriptors -->
+  <public publicId="-//Sun Microsystems, Inc.//DTD Connector 1.0//EN" uri="../../../docs/dtd/connector_1_0.dtd"/>
+  <!--  war meta-data -->
+  <public publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" uri="../../../docs/dtd/web-app_2_2.dtd"/>
+  <public publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" uri="../../../docs/dtd/web-app_2_3.dtd"/>
+  <!--  jboss-specific -->
+  <public publicId="-//JBoss//DTD J2EE Application 1.3//EN" uri="../../../docs/dtd/jboss-app_3_0.dtd"/>
+  <public publicId="-//JBoss//DTD J2EE Application 1.3V2//EN" uri="../../../docs/dtd/jboss-app_3_2.dtd"/>
+  <public publicId="-//JBoss//DTD J2EE Application 1.4//EN" uri="../../../docs/dtd/jboss-app_4_0.dtd"/>
+  <public publicId="-//JBoss//DTD JAWS//EN" uri="../../../docs/dtd/jaws.dtd"/>
+  <public publicId="-//JBoss//DTD JAWS 2.4//EN" uri="../../../docs/dtd/jaws_2_4.dtd"/>
+  <public publicId="-//JBoss//DTD JAWS 3.0//EN" uri="../../../docs/dtd/jaws_3_0.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSS//EN" uri="../../../docs/dtd/jboss.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSS 2.4//EN" uri="../../../docs/dtd/jboss_2_4.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSS 3.0//EN" uri="../../../docs/dtd/jboss_3_0.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSS 3.2//EN" uri="../../../docs/dtd/jboss_3_2.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSS 4.0//EN" uri="../../../docs/dtd/jboss_4_0.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSS 5.0//EN" uri="../../../docs/dtd/jboss_5_0.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSSCMP-JDBC 3.0//EN" uri="../../../docs/dtd/jbosscmp-jdbc_3_0.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN" uri="../../../docs/dtd/jbosscmp-jdbc_3_2.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSSCMP-JDBC 4.0//EN" uri="../../../docs/dtd/jbosscmp-jdbc_4_0.dtd"/>
+  <public publicId="-//JBoss//DTD Web Application 2.2//EN" uri="../../../docs/dtd/jboss-web.dtd"/>
+  <public publicId="-//JBoss//DTD Web Application 2.3//EN" uri="../../../docs/dtd/jboss-web_3_0.dtd"/>
+  <public publicId="-//JBoss//DTD Web Application 2.3V2//EN" uri="../../../docs/dtd/jboss-web_3_2.dtd"/>
+  <public publicId="-//JBoss//DTD Web Application 2.4//EN" uri="../../../docs/dtd/jboss-web_4_0.dtd"/>
+  <public publicId="-//JBoss//DTD Web Application 5.0//EN" uri="../../../docs/dtd/jboss-web_5_0.dtd"/>
+  <public publicId="-//JBoss//DTD Application Client 3.2//EN" uri="../../../docs/dtd/jboss-client_3_2.dtd"/>
+  <public publicId="-//JBoss//DTD Application Client 4.0//EN" uri="../../../docs/dtd/jboss-client_4_0.dtd"/>
+  <public publicId="-//JBoss//DTD Application Client 5.0//EN" uri="../../../docs/dtd/jboss-client_5_0.dtd"/>
+  <public publicId="-//JBoss//DTD MBean Service 3.2//EN" uri="../../../docs/dtd/jboss-service_3_2.dtd"/>
+  <public publicId="-//JBoss//DTD MBean Service 4.0//EN" uri="../../../docs/dtd/jboss-service_4_0.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSS XMBEAN 1.0//EN" uri="../../../docs/dtd/jboss_xmbean_1_0.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSS XMBEAN 1.1//EN" uri="../../../docs/dtd/jboss_xmbean_1_1.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSS XMBEAN 1.2//EN" uri="../../../docs/dtd/jboss_xmbean_1_2.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSS Security Config 3.0//EN" uri="../../../docs/dtd/security_config.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSS JCA Config 1.0//EN" uri="../../../docs/dtd/jboss-ds_1_0.dtd"/>
+  <public publicId="-//JBoss//DTD JBOSS JCA Config 1.5//EN" uri="../../../docs/dtd/jboss-ds_1_5.dtd"/>
+  <system systemId="http://www.jboss.org/j2ee/schema/security-config_4_0.xsd" uri="../../../docs/schema/security-config_4_0.xsd"/>
+  <system systemId="urn:jboss:aop-deployer" uri="../../../docs/schema/aop-deployer_1_1.xsd"/>
+  <system systemId="urn:jboss:aop-beans:1.0" uri="../../../docs/schema/aop-beans_1_0.xsd"/>
+  <system systemId="urn:jboss:bean-deployer" uri="../../../docs/schema/bean-deployer_1_0.xsd"/>
+  <system systemId="urn:jboss:bean-deployer:2.0" uri="../../../docs/schema/bean-deployer_2_0.xsd"/>
+  <system systemId="urn:jboss:javabean:1.0" uri="../../../docs/schema/javabean_1_0.xsd"/>
+  <system systemId="urn:jboss:security-config:4.1" uri="../../../docs/schema/security-config_4_1.xsd"/>
+  <system systemId="urn:jboss:security-config:5.0" uri="../../../docs/schema/security-config_5_0.xsd"/>
+  <system systemId="urn:jboss:jndi-binding-service:1.0" uri="../../../docs/schema/jndi-binding-service_1_0.xsd"/>
+  <system systemId="urn:jboss:jbossws-config:5.0" uri="../../../docs/schema/jbossws-config_1_0.xsd"/>
+  <system systemId="urn:jboss:user-roles:1.0" uri="../../../docs/schema/user-roles_1_0.xsd"/>
+  <!-- xml -->
+  <public publicId="-//W3C//DTD/XMLSCHEMA 200102//EN" uri="../../../docs/dtd/XMLSchema.dtd"/>
+  <system systemId="http://www.w3.org/2001/XMLSchema.dtd" uri="../../../docs/dtd/XMLSchema.dtd"/>
+  <!-- // This dtd doesn't have a publicId - see XMLSchema.dtd -->
+  <system systemId="datatypes" uri="../../../docs/dtd/datatypes.dtd"/>
+  <system systemId="http://www.w3.org/XML/1998/namespace" uri="../../../docs/schema/xml.xsd"/>
+  
+  <!-- ejb3 + jee5 related-->
+  <system systemId="http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" uri="../../../docs/schema/ejb-jar_3_0.xsd"/>
+  <system systemId="http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_2.xsd" uri="../../../docs/schema/javaee_web_services_client_1_2.xsd"/>
+  <system systemId="http://java.sun.com/xml/ns/javaee/javaee_5.xsd" uri="../../../docs/schema/javaee_5.xsd"/>
+  <system systemId="http://www.jboss.org/j2ee/schema/jboss_5_0.xsd" uri="../../../docs/schema/jboss_5_0.xsd"/>
+  <system systemId="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" uri="../../../docs/schema/web-app_2_5.xsd"/>
+  
+</catalog>


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/jax-ws-catalog.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/jboss-log4j.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/jboss-log4j.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/jboss-log4j.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/jboss-log4j.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration information and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ================================= -->
+   <!-- Preserve messages in a local file -->
+   <!-- ================================= -->
+
+   <!-- A time/date based rolling appender -->
+   <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="File" value="${jboss.server.log.dir}/server.log"/>
+      <param name="Append" value="true"/>
+      <!-- In AS 5.0.x the server log threshold was set by a system
+           property. In 5.1 and later we are instead using the system
+           property to set the priority on the root logger (see <root/> below)
+      <param name="Threshold" value="${jboss.server.log.threshold}"/>
+      -->
+      
+      <!-- Rollover at midnight each day -->
+      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+      <!-- Rollover at the top of each hour
+      <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+      -->
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] (Thread) Message\n -->
+         <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
+
+         <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+         <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+          -->
+      </layout>
+   </appender>
+
+   <!-- A size based file rolling appender
+   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="File" value="${jboss.server.log.dir}/server.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+     </layout>	    
+   </appender>
+   -->
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <!-- ====================== -->
+   <!-- More Appender examples -->
+   <!-- ====================== -->
+
+   <!-- Buffer events and log them asynchronously
+   <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <appender-ref ref="FILE"/>
+     <appender-ref ref="CONSOLE"/>
+     <appender-ref ref="SMTP"/>
+   </appender>
+   -->
+
+   <!-- EMail events to an administrator
+   <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Threshold" value="ERROR"/>
+     <param name="To" value="admin at myhost.domain.com"/>
+     <param name="From" value="nobody at myhost.domain.com"/>
+     <param name="Subject" value="JBoss Sever Errors"/>
+     <param name="SMTPHost" value="localhost"/>
+     <param name="BufferSize" value="10"/>
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+     </layout>
+   </appender>
+   -->
+
+   <!-- Syslog events
+   <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Facility" value="LOCAL7"/>
+     <param name="FacilityPrinting" value="true"/>
+     <param name="SyslogHost" value="localhost"/>
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+     </layout>
+   </appender>
+   -->
+
+   <!-- Log events to JMS (requires a topic to be created)
+   <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Threshold" value="ERROR"/>
+     <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+     <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+   </appender>
+   -->
+
+   <!-- Log events through SNMP
+   <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
+     <param name="ManagementHost" value="127.0.0.1"/>
+     <param name="ManagementHostTrapListenPort" value="162"/>
+     <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
+     <param name="LocalIPAddress" value="127.0.0.1"/>
+     <param name="LocalTrapSendPort" value="161"/>
+     <param name="GenericTrapType" value="6"/>
+     <param name="SpecificTrapType" value="12345678"/>
+     <param name="CommunityString" value="public"/>
+     <param name="ForwardStackTraceWithTrap" value="true"/>
+     <param name="Threshold" value="DEBUG"/>
+     <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
+     <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
+     </layout>
+   </appender>
+   -->
+
+   <!--  Emit events as JMX notifications
+   <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      
+      <param name="Threshold" value="WARN"/>
+      <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
+      
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
+      </layout>
+   </appender>
+   -->
+
+   <!-- Security AUDIT Appender
+   <appender name="AUDIT" class="org.jboss.logging.appender.DailyRollingFileAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="File" value="${jboss.server.log.dir}/audit.log"/>
+      <param name="Append" value="true"/>
+      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%d %-5p [%c] (%t:%x) %m%n"/>
+      </layout>
+   </appender>
+   -->
+   
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+   <category name="org.apache">
+      <priority value="INFO"/>
+   </category>
+   
+   <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+   <category name="jacorb">
+      <priority value="WARN"/>
+   </category>
+   
+   <!-- Set the logging level of the JSF implementation that uses
+      | java.util.logging. The jdk logging levels can be controlled
+      | through the org.jboss.logging.log4j.JDKLevel class that
+      | in addition to the standard log4j levels it adds support for
+      | SEVERE, WARNING, CONFIG, FINE, FINER, FINEST
+   -->
+   <category name="javax.enterprise.resource.webcontainer.jsf">
+     <priority value="INFO" class="org.jboss.logging.log4j.JDKLevel"/>
+   </category>
+   
+   <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+   <category name="org.jgroups">
+      <priority value="WARN"/>
+   </category>
+   
+   <!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
+   <category name="org.quartz">
+      <priority value="INFO"/>
+   </category>
+   
+   <!-- Limit JBoss categories
+   <category name="org.jboss">
+      <priority value="INFO"/>
+   </category>
+   -->
+
+   <!-- Limit the JSR77 categories -->
+   <category name="org.jboss.management">
+      <priority value="INFO"/>
+   </category>
+
+   <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
+   <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
+     <priority value="TRACE"/>
+   </category>
+   -->
+
+   <!-- Category specifically for Security Audit Provider 
+   <category name="org.jboss.security.audit.providers.LogAuditProvider" additivity="false">
+     <priority value="TRACE"/>
+     <appender-ref ref="AUDIT"/>
+   </category>
+   -->
+   
+   <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
+   <category name="org.jboss.serial">
+      <priority value="INFO"/>
+   </category>
+  
+   <!-- Decrease the priority threshold for the org.jboss.varia category
+   <category name="org.jboss.varia">
+     <priority value="DEBUG"/>
+   </category>
+   -->
+   
+   <!-- Enable JBossWS message tracing
+   <category name="org.jboss.ws.core.MessageTrace">
+     <priority value="TRACE"/>
+   </category>
+   -->
+   
+   <!--
+      | An example of enabling the custom TRACE level priority that is used
+      | by the JBoss internals to diagnose low level details. This example
+      | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+      | subpackages. This will produce A LOT of logging output.
+      |
+      | Note: since jboss AS 4.2.x, the trace level is supported natively by
+      | log4j, so although the custom org.jboss.logging.XLevel priority will
+      | still work, there is no need to use it. The two examples that follow
+      | will both enable trace logging.
+   <category name="org.jboss.system">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+   <category name="org.jboss.ejb.plugins">
+     <priority value="TRACE"/>
+   </category>
+   -->
+  
+   <!--
+       | Logs these events to SNMP:
+           - server starts/stops
+           - cluster evolution (node death/startup)
+           - When an EJB archive is deployed (and associated verified messages)
+           - When an EAR archive is deployed
+      	 
+   <category name="org.jboss.system.server.Server">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+  
+   <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+
+   <category name="org.jboss.deployment.MainDeployer">
+     <priority value="ERROR" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   
+   <category name="org.jboss.ejb.EJBDeployer">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   
+   <category name="org.jboss.deployment.EARDeployer">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   -->
+
+   <!-- Clustering logging -->
+   <!-- Uncomment the following to redirect the org.jgroups and
+      org.jboss.ha categories to a cluster.log file.
+
+   <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+     </layout>
+   </appender>
+   <category name="org.jgroups">
+     <priority value="DEBUG" />
+     <appender-ref ref="CLUSTER"/>
+   </category>
+   <category name="org.jboss.ha">
+     <priority value="DEBUG" />
+     <appender-ref ref="CLUSTER"/>
+   </category>
+   -->
+   
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <!-- 
+         Set the root logger priority via a system property. Note this is parsed by log4j,
+         so the full JBoss system property format is not supported; e.g.
+         setting a default via ${jboss.server.log.threshold:WARN} will not work.         
+       -->
+      <priority value="${jboss.server.log.threshold}"/>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+</log4j:configuration>


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/jboss-log4j.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/jboss-service.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/jboss-service.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/jboss-service.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/jboss-service.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<!-- ===================================================================== -->
+<!--  JBoss Server Configuration                                           -->
+<!-- ===================================================================== -->
+
+<server>
+
+   <!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and
+        the shared JBOSS_HOME/common/lib directory. This can be restricted to
+        specific jars by specifying them in the archives attribute.
+   -->
+   <classpath codebase="${jboss.server.lib.url}" archives="*"/>
+   <classpath codebase="${jboss.common.lib.url}" archives="*"/>
+
+   <!-- ==================================================================== -->
+   <!-- Main Deployer                                                        -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.deployment.MainDeployer"
+          name="jboss.system:service=MainDeployer">
+   	<!-- This is used to delegate the deployment handling -->
+      <attribute name="KernelMainDeployer"><inject bean="MainDeployer" /></attribute>
+      <!-- This is used to validate incomplete deployments -->
+      <attribute name="Controller"><inject bean="jboss.kernel:service=Kernel" property="controller"/></attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- XMBean Persistence                                                   -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.system.pm.AttributePersistenceService"
+      name="jboss:service=AttributePersistenceService"
+      xmbean-dd="resource:xmdesc/AttributePersistenceService-xmbean.xml">
+      <!-- the AttributePersistenceService is persistent, itself -->
+
+      <!--
+      <attribute name="AttributePersistenceManagerClass">org.jboss.system.pm.XMLAttributePersistenceManager</attribute>
+      <attribute name="AttributePersistenceManagerConfig">
+         <data-directory>data/xmbean-attrs</data-directory>
+      </attribute>
+      <attribute name="ApmDestroyOnServiceStop">false</attribute>
+      <attribute name="VersionTag"></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>
+
+   <!-- ==================================================================== -->
+   <!-- 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:jboss-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>
+      
+      <!-- The value to assign to system property jboss.server.log.threshold
+           if it is not already set. This system property in turn controls
+           the logging threshold for the server.log file.
+           If the system property is already set when this service is created,
+           this value is ignored. -->
+      <attribute name="DefaultJBossServerLogThreshold">INFO</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Active Alarm Table                                                   -->
+   <!-- ==================================================================== -->
+
+   <!--
+      | The ActiveAlarmTable service is a simple JMX notification listener
+      | that maintains a table with the received notifications (alarms).
+      | The alarms can be acknowledged through the jmx or the web console.
+      | Modify the SubscriptionList below to subscribe for any notification
+      | in the system and treat it as an alarm.
+      | The JMXNotificationAppender is a log4j Appender that can be configured
+      | in log4j.xml, that trasforms logging events to JMX notification so they
+      | can be fed back into the table. By storing the WARN or higher level logging
+      | events you can have a quick view of important system faults.
+      |
+      | The following attributes may be set:
+      |
+      | MaxTableSize (default 1000)
+      |  - set an upper limit to the number of stored alarms
+      | LogLevel (default DEBUG)
+      |  - the log level to use for received notification, can be set to NONE
+      | ServerId (default jboss)
+      |  - used to construct unique alarm ids
+      | SubscriptionList
+      |  - subscribe for the notifications to be stored in the table
+
+   <mbean code="org.jboss.monitor.services.ActiveAlarmTable"
+          name="jboss.monitor:service=ActiveAlarmTable">
+      <attribute name="SubscriptionList">
+         <subscription-list>
+            <mbean name="jboss.monitor:*">
+               <notification type="jboss.alarm"/>
+               <notification type="JBOSS_MONITOR_NOTIFICATION"/>
+            </mbean>
+            <mbean name="jboss.system:service=Logging,type=JMXNotificationAppender"/>
+         </subscription-list>
+      </attribute>
+   </mbean>
+   -->
+
+   <!-- ==================================================================== -->
+   <!-- JBoss RMI Classloader - only install when available                  -->
+   <!-- ==================================================================== -->
+   <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
+      name="jboss.rmi:type=RMIClassLoader">
+      <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
+      <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Class Loading                                                        -->
+   <!-- ==================================================================== -->
+
+   <!-- A mini webserver used for dynamic and class and resource loading --> 
+   <mbean code="org.jboss.web.WebService"
+      name="jboss:service=WebService">
+      <!-- The Bind address and Port -->
+      <attribute name="BindAddress">${jboss.bind.address}</attribute>      
+      <attribute name="Port">
+         <!-- Get the port to use from ServiceBindingManager. -->
+         <value-factory bean="ServiceBindingManager" method="getIntBinding" parameter="jboss:service=WebService"/>
+      </attribute>
+      <!--  The address to use for the host portion of the RMI codebase URL -->
+      <attribute name="Host">${java.rmi.server.hostname}</attribute>
+      <!-- Should non-EJB .class files be downloadable -->
+      <attribute name="DownloadServerClasses">true</attribute>
+      <!-- Should resources other than .class files be downloadable. Both
+         DownloadServerClasses and DownloadResources must be true for resources
+         to be downloadable. This is false by default because its generally a
+         bad idea as server configuration files that container security
+         information can be accessed.
+       -->
+      <attribute name="DownloadResources">false</attribute>
+
+      <!-- Use the default thread pool for dynamic class loading -->
+      <depends optional-attribute-name="ThreadPool"
+         proxy-type="attribute">jboss.system:service=ThreadPool</depends>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- JNDI                                                                 -->
+   <!-- ==================================================================== -->
+
+   <!-- A simple mbean wrapper around the jndi Naming object. This
+      only handles an in memory instance. The NamingService uses this
+      as the JNDI store and exposes it remotely.
+   -->
+   <mbean code="org.jnp.server.NamingBeanImpl"
+      name="jboss:service=NamingBeanImpl"
+      xmbean-dd="resource:xmdesc/NamingBean-xmbean.xml">
+   </mbean>
+   
+   <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">
+         <value-factory bean="ServiceBindingManager" method="getIntBinding">
+            <parameter>jboss:service=Naming</parameter>
+            <parameter>Port</parameter>
+         </value-factory>
+      </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">
+         <value-factory bean="ServiceBindingManager" method="getIntBinding">
+            <parameter>jboss:service=Naming</parameter>
+            <parameter>RmiPort</parameter>
+         </value-factory>
+      </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>
+      <!-- An example of using the unifed invoker as the transport.
+         <depends optional-attribute-name="InvokerProxyFactory"
+         proxy-type="attribute">jboss:service=proxyFactory,type=unified,target=Naming</depends>
+      -->
+      <depends optional-attribute-name="Naming"
+         proxy-type="attribute">jboss:service=NamingBeanImpl</depends>
+   </mbean>
+   
+   <mbean code="org.jboss.naming.JNDIView"
+   	name="jboss:service=JNDIView"
+   	xmbean-dd="resource:xmdesc/JNDIView-xmbean.xml">
+   	<!-- The HANamingService service name -->
+   	<attribute name="HANamingService">jboss:service=HAJNDI</attribute>
+   </mbean>
+
+   <!-- ==================================================================== -->
+   <!-- Security                                                             -->
+   <!-- ==================================================================== -->
+
+   <!-- JAAS security manager and realm mapping -->
+   <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
+      name="jboss.security:service=JaasSecurityManager">
+      <!-- A flag which indicates whether the SecurityAssociation server mode
+      is set on service creation. This is true by default since the
+      SecurityAssociation should be thread local for multi-threaded server
+      operation.
+      -->
+      <attribute name="ServerMode">true</attribute>
+      <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">1800</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>
+      <!-- DeepCopySubjectMode: This set the copy mode of subjects done by the
+      security managers to be deep copies that makes copies of the subject
+      principals and credentials if they are cloneable. It should be set to
+      true if subject include mutable content that can be corrupted when
+      multiple threads have the same identity and cache flushes/logout clearing
+      the subject in one thread results in subject references affecting other
+      threads.
+      -->
+      <attribute name="DeepCopySubjectMode">false</attribute>
+   </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"/>
+
+</server>


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/jboss-service.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/login-config.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/login-config.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/login-config.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/login-config.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,132 @@
+<?xml version='1.0'?>
+
+<!-- The XML based JAAS login configuration read by the
+org.jboss.security.auth.login.XMLLoginConfig mbean. Add
+an application-policy element for each security domain.
+
+The outline of the application-policy is:
+<application-policy name="security-domain-name">
+  <authentication>
+    <login-module code="login.module1.class.name" flag="control_flag">
+      <module-option name = "option1-name">option1-value</module-option>
+      <module-option name = "option2-name">option2-value</module-option>
+      ...
+    </login-module>
+
+    <login-module code="login.module2.class.name" flag="control_flag">
+      ...
+    </login-module>
+    ...
+  </authentication>
+</application-policy>
+
+$Id$
+$Revision$
+-->
+
+<policy>
+  <!-- Used by clients within the application server VM such as
+  mbeans and servlets that access EJBs.
+  -->
+  <application-policy name="client-login">
+    <authentication>
+      <login-module code="org.jboss.security.ClientLoginModule"
+        flag="required">
+         <!-- Any existing security context will be restored on logout -->
+         <module-option name="restore-login-identity">true</module-option>
+      </login-module>
+    </authentication>
+  </application-policy>
+
+  <!-- Security domains for testing new jca framework -->
+  <application-policy name="HsqlDbRealm">
+    <authentication>
+      <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
+        flag="required">
+        <module-option name="principal">sa</module-option>
+        <module-option name="userName">sa</module-option>
+        <module-option name="password"></module-option>
+        <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+      </login-module>
+    </authentication>
+  </application-policy>
+
+  <application-policy name="JmsXARealm">
+    <authentication>
+      <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
+        flag="required">
+        <module-option name="principal">guest</module-option>
+        <module-option name="userName">guest</module-option>
+        <module-option name="password">guest</module-option>
+        <module-option name="managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+      </login-module>
+    </authentication>
+  </application-policy>
+
+  <!-- A template configuration for the jmx-console web application. This
+    defaults to the UsersRolesLoginModule the same as other and should be
+    changed to a stronger authentication mechanism as required.
+  -->
+  <application-policy name="jmx-console">
+    <authentication>
+      <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+        flag="required">
+        <module-option name="usersProperties">props/jmx-console-users.properties</module-option>
+        <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option>
+      </login-module>
+    </authentication>
+  </application-policy>
+
+  <!-- A template configuration for the web-console web application. This
+    defaults to the UsersRolesLoginModule the same as other and should be
+    changed to a stronger authentication mechanism as required.
+  -->
+  <application-policy name="web-console">
+    <authentication>
+      <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+        flag="required">
+        <module-option name="usersProperties">web-console-users.properties</module-option>
+        <module-option name="rolesProperties">web-console-roles.properties</module-option>
+      </login-module>
+    </authentication>
+  </application-policy>
+
+  <!--
+    A template configuration for the JBossWS security domain.
+    This defaults to the UsersRolesLoginModule the same as other and should be
+    changed to a stronger authentication mechanism as required.
+  -->
+  <application-policy name="JBossWS">
+    <authentication>
+      <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+        flag="required">
+        <module-option name="usersProperties">props/jbossws-users.properties</module-option>
+        <module-option name="rolesProperties">props/jbossws-roles.properties</module-option>
+        <module-option name="unauthenticatedIdentity">anonymous</module-option>
+      </login-module>
+    </authentication>
+  </application-policy>
+
+  <!-- The default login configuration used by any security domain that
+  does not have a application-policy entry with a matching name
+  -->
+  <application-policy name="other">
+    <!-- A simple server login module, which can be used when the number
+    of users is relatively small. It uses two properties files:
+    users.properties, which holds users (key) and their password (value).
+    roles.properties, which holds users (key) and a comma-separated list of
+    their roles (value).
+    The unauthenticatedIdentity property defines the name of the principal
+    that will be used when a null username and password are presented as is
+    the case for an unuathenticated web client or MDB. If you want to
+    allow such users to be authenticated add the property, e.g.,
+    unauthenticatedIdentity="nobody"
+    -->
+    <authentication>
+      <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+        flag="required"/>
+    </authentication>
+  </application-policy>
+
+</policy>
+


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/login-config.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/props (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/props)


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/props
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: branches/Branch_5_x/server/src/etc/conf/all/standardjboss.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/standardjboss.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/standardjboss.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/standardjboss.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,1111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss PUBLIC
+      "-//JBoss//DTD JBOSS 5.0//EN"
+      "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+
+<!-- ===================================================================== -->
+<!--  Standard JBoss EJB Configurations                                    -->
+<!-- ===================================================================== -->
+<!-- $Id$ -->
+
+<jboss>
+  <!--
+   The missing-method-permissions-excluded-mode is a boolean
+   that allows the deployer to globally indicate that all methods without a
+   method-permission element should be treated as excluded(= true and the default),
+   or that methods without a method-permission element should be treated as
+   unchecked(= false)
+  -->
+  <missing-method-permissions-excluded-mode>true</missing-method-permissions-excluded-mode>
+  <!-- The default principal name for callers without credentials
+  -->
+  <unauthenticated-principal>anonymous</unauthenticated-principal>
+
+  <invoker-proxy-bindings>
+
+    <invoker-proxy-binding>
+      <name>entity-unified-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=unified</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.ejb.SecurityContextInterceptor</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.ejb.SecurityContextInterceptor</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.ejb.SecurityContextInterceptor</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-unified-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=unifiedha</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.ejb.SecurityContextInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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.ejb.SecurityContextInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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.ejb.SecurityContextInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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-unified-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=unified</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.ejb.SecurityContextInterceptor</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.ejb.SecurityContextInterceptor</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-unified-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=unifiedha</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.ejb.SecurityContextInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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.ejb.SecurityContextInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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-unified-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=unified</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.ejb.SecurityContextInterceptor</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.ejb.SecurityContextInterceptor</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-unified-invoker</name>
+      <invoker-mbean>jboss:service=invoker,type=unifiedha</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.ejb.SecurityContextInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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.ejb.SecurityContextInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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>false</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>false</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>
+        <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>
+        <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>
+      </proxy-factory-config>
+    </invoker-proxy-binding>
+  </invoker-proxy-bindings>
+
+  <container-configurations>
+
+    <container-configuration>
+      <container-name>Standard Pessimistic CMP 2.x EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-unified-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.security.PreSecurityInterceptor</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-unified-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.security.PreSecurityInterceptor</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>
+            <!-- uncomment to enable time-based eviction
+            <overager-period>300</overager-period>
+            <max-bean-age>600</max-bean-age> -->
+         </cache-policy-conf>
+         <cache-policy-conf-other>
+            <partitions>10</partitions>
+            <!-- uncomment to use JDBC java.sql.Statement.executeBatch()
+            <batch-commit-strategy/> -->
+            <!-- uncomment to enable cache invalidation <invalidable/> -->
+         </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-unified-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.security.PreSecurityInterceptor</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>
+         <home-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</home-load-balance-policy>
+         <bean-load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailable</bean-load-balance-policy>
+      </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-unified-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.security.PreSecurityInterceptor</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-unified-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.security.PreSecurityInterceptor</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 extends="Instance Per Transaction CMP 2.x EntityBean">
+      <container-name>Standard CMP 2.x EntityBean</container-name>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard Pessimistic CMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-unified-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.security.PreSecurityInterceptor</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-unified-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.security.PreSecurityInterceptor</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>
+         <home-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</home-load-balance-policy>
+         <bean-load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailable</bean-load-balance-policy>
+      </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-unified-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.security.PreSecurityInterceptor</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 extends="Instance Per Transaction CMP EntityBean">
+      <container-name>Standard CMP EntityBean</container-name>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard Stateless SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>stateless-unified-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.security.PreSecurityInterceptor</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.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>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-unified-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.security.PreSecurityInterceptor</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.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>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>
+         <home-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</home-load-balance-policy>
+         <bean-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</bean-load-balance-policy>
+      </cluster-config>
+    </container-configuration>
+
+
+    <container-configuration>
+      <container-name>Standard Stateful SessionBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>stateful-unified-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.security.PreSecurityInterceptor</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>
+        <interceptor>org.jboss.ejb.plugins.StatefulSessionSecurityInterceptor</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-unified-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.security.PreSecurityInterceptor</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.ejb.plugins.StatefulSessionSecurityInterceptor</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>
+         <home-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</home-load-balance-policy>
+         <bean-load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailable</bean-load-balance-policy>
+         <session-state-manager-jndi-name>/HASessionState/Default</session-state-manager-jndi-name>
+      </cluster-config>
+    </container-configuration>
+
+    <container-configuration>
+      <container-name>Standard Pessimistic BMP EntityBean</container-name>
+      <call-logging>false</call-logging>
+      <invoker-proxy-binding-name>entity-unified-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.security.PreSecurityInterceptor</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-unified-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.security.PreSecurityInterceptor</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>
+         <home-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</home-load-balance-policy>
+         <bean-load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailable</bean-load-balance-policy>
+      </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-unified-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.security.PreSecurityInterceptor</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 extends="Instance Per Transaction BMP EntityBean">
+      <container-name>Standard BMP EntityBean</container-name>
+    </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>


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/standardjboss.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/standardjbosscmp-jdbc.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/standardjbosscmp-jdbc.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/standardjbosscmp-jdbc.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/all/standardjbosscmp-jdbc.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,3100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC
+   "-//JBoss//DTD JBOSSCMP-JDBC 4.0//EN"
+   "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_4_0.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Standard JBossCMP-JDBC Configuration                                 -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<jbosscmp-jdbc>
+
+   <defaults>
+      <datasource>java:/DefaultDS</datasource>
+      <!-- optional since 4.0 <datasource-mapping>@default.type.mapping@</datasource-mapping> -->
+
+      <create-table>true</create-table>
+      <remove-table>false</remove-table>
+      <read-only>false</read-only>
+      <read-time-out>300000</read-time-out>
+      <row-locking>false</row-locking>
+      <pk-constraint>true</pk-constraint>
+      <fk-constraint>false</fk-constraint>
+      <preferred-relation-mapping>foreign-key</preferred-relation-mapping>
+      <read-ahead>
+         <strategy>on-load</strategy>
+         <page-size>1000</page-size>
+         <eager-load-group>*</eager-load-group>
+      </read-ahead>
+      <list-cache-max>1000</list-cache-max>
+      <clean-read-ahead-on-load>false</clean-read-ahead-on-load>
+
+      <unknown-pk>
+         <key-generator-factory>UUIDKeyGeneratorFactory</key-generator-factory>
+         <unknown-pk-class>java.lang.String</unknown-pk-class>
+         <jdbc-type>VARCHAR</jdbc-type>
+         <sql-type>VARCHAR(32)</sql-type>
+      </unknown-pk>
+
+      <entity-command name="default"/>
+      <ql-compiler>org.jboss.ejb.plugins.cmp.jdbc.JDBCEJBQLCompiler</ql-compiler>
+      <throw-runtime-exceptions>false</throw-runtime-exceptions>
+   </defaults>
+
+   <type-mappings>
+      <type-mapping>
+         <name>FirstSQL/J</name>
+         <row-locking-template/>
+         <pk-constraint-template>PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>(?1 || ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substring</function-name>
+            <function-sql>substring(?1 FROM ?2 FOR ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>char_length(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>position(?1 IN ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>math.abs(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>math.sqrt(CAST(?1 AS DOUBLE))</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>TINYINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>TINYINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>BIGINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>REAL</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <!-- or <sql-type>VARCHAR(2147483500)</sql-type> -->
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>DECIMAL</jdbc-type>
+            <sql-type>DECIMAL</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <!-- FirstSQL/J only supports directly serializable objects for classes declared with CREATE CLASS -->
+            <jdbc-type>LONGVARBINARY</jdbc-type>
+            <sql-type>VARCHAR(2147483500)</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>Ingres</name>
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 PRIMARY KEY (?3)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>TRUE</true-mapping>
+         <false-mapping>FALSE</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>concat(?1,?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substring</function-name>
+            <function-sql>left(?1,?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>length(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>locate(?1,?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>abs(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>sqrt(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <!-- change from bit to integer , 10.12.2002 heb -->
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>INT1</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>INTEGER4</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>FLOAT</jdbc-type>
+            <sql-type>FLOAT4</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>FLOAT8</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>FLOAT8</sql-type>
+         </mapping>
+<!--
+Mapping proposed by Computer Associates, but does not work with JBoss properly
+28.03.2003 hou
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>NUMERIC</jdbc-type>
+            <sql-type>DECIMAL(24,6)</sql-type>
+         </mapping>
+-->
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>JAVA_OBJECT</jdbc-type>
+            <sql-type>LONG VARCHAR</sql-type>
+         </mapping>
+      </type-mapping>
+     <type-mapping>
+      <name>McKoi</name>
+      <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+      <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+      <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+      <alias-header-prefix>t</alias-header-prefix>
+      <alias-header-suffix>_</alias-header-suffix>
+      <alias-max-length>32</alias-max-length>
+      <subquery-supported>true</subquery-supported>
+      <true-mapping>TRUE</true-mapping>
+      <false-mapping>FALSE</false-mapping>
+
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+      <mapping>
+         <java-type>java.lang.Boolean</java-type>
+         <jdbc-type>BIT</jdbc-type>
+         <sql-type>BOOLEAN</sql-type>
+      </mapping>
+      <mapping>
+         <java-type>java.lang.Byte</java-type>
+         <jdbc-type>TINYINT</jdbc-type>
+         <sql-type>SMALLINT</sql-type>
+      </mapping>
+      <mapping>
+         <java-type>java.lang.Short</java-type>
+         <jdbc-type>SMALLINT</jdbc-type>
+         <sql-type>SMALLINT</sql-type>
+      </mapping>
+      <mapping>
+         <java-type>java.lang.Integer</java-type>
+         <jdbc-type>INTEGER</jdbc-type>
+         <sql-type>INTEGER</sql-type>
+      </mapping>
+      <mapping>
+         <java-type>java.lang.Long</java-type>
+         <jdbc-type>BIGINT</jdbc-type>
+         <sql-type>BIGINT</sql-type>
+      </mapping>
+      <mapping>
+         <java-type>java.lang.Float</java-type>
+         <jdbc-type>REAL</jdbc-type>
+         <sql-type>FLOAT</sql-type>
+      </mapping>
+      <mapping>
+         <java-type>java.lang.Double</java-type>
+         <jdbc-type>DOUBLE</jdbc-type>
+         <sql-type>DOUBLE</sql-type>
+      </mapping>
+      <mapping>
+         <java-type>java.lang.Character</java-type>
+         <jdbc-type>CHAR</jdbc-type>
+         <sql-type>CHAR</sql-type>
+      </mapping>
+      <mapping>
+         <java-type>java.lang.String</java-type>
+         <jdbc-type>VARCHAR</jdbc-type>
+         <sql-type>VARCHAR(64)</sql-type>
+      </mapping>
+      <mapping>
+         <java-type>java.sql.Date</java-type>
+         <jdbc-type>DATE</jdbc-type>
+         <sql-type>DATE</sql-type>
+      </mapping>
+      <mapping>
+         <java-type>java.sql.Time</java-type>
+         <jdbc-type>TIME</jdbc-type>
+         <sql-type>TIME</sql-type>
+      </mapping>
+      <mapping>
+         <java-type>java.sql.Timestamp</java-type>
+         <jdbc-type>TIMESTAMP</jdbc-type>
+         <sql-type>TIMESTAMP</sql-type>
+      </mapping>
+      <mapping>
+         <java-type>java.lang.Object</java-type>
+         <jdbc-type>JAVA_OBJECT</jdbc-type>
+         <sql-type>JAVA_OBJECT</sql-type>
+      </mapping>
+     </type-mapping>
+
+      <type-mapping>
+         <name>Firebird</name>
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>31</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>SMALLINT default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>SMALLINT default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>NUMERIC(18,0) default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>FLOAT default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE PRECISION default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <!-- The small default length is due to the 128 byte max index key size -->
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(64)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>JAVA_OBJECT</jdbc-type>
+            <sql-type>BLOB</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>InterBase</name>
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>31</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>SMALLINT default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>SMALLINT default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>NUMERIC(18,0) default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>FLOAT default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE PRECISION default 0</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(64)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>JAVA_OBJECT</jdbc-type>
+            <sql-type>VARCHAR(2000)</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>DB2</name>
+         <row-locking-template/>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>18</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+		 <function-mapping>
+			 <function-name>locate</function-name>
+			 <function-sql>locate(CAST(?1 as VARCHAR(254)),
+				 CAST(?2 as VaRCHAR(254)),?3)</function-sql>
+		 </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+    <!--  DB2 does not appear to support columns of type "byte"
+    Regrettably, this means they'll be serialized.
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR(1) FOR BIT DATA</sql-type>
+         </mapping>
+    -->
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>BIGINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>REAL</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(254)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <!-- this one gives errors with DB2 V8.1
+         		and at least the NET driver
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>JAVA_OBJECT</jdbc-type>
+            <sql-type>BLOB(2000)</sql-type>
+         </mapping>
+         -->
+      	<mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>VARBINARY</jdbc-type>
+            <sql-type>BLOB(2000)</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>Derby</name>
+         <row-locking-template/>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>18</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>(?1 || ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substr</function-name>
+            <function-sql>substr(?1, ?2, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>length(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>locate(?2, ?1, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>abs(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>sqrt(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>NUMERIC</jdbc-type>
+            <sql-type>DECIMAL</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>BOOLEAN</sql-type>
+         </mapping>
+<!-- if someone knows the mapping for byte, please, let us know!
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+-->
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>BIGINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>REAL</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE PRECISION</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>BLOB</jdbc-type>
+            <sql-type>BLOB</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>Oracle9i</name>
+         <!--
+         | Make sure that you have the Oracle 9i version of classes12.jar
+         | or you will suffer
+         -->
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>30</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>(?1 || ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substring</function-name>
+            <function-sql>substr(?1, ?2, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>length(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>instr(?2, ?1, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>abs(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>sqrt(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>NUMBER(1)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>NUMBER(3)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>NUMERIC</jdbc-type>
+            <!-- <jdbc-type>SMALLINT</jdbc-type> this resulted in a ClassCastException -->
+            <sql-type>NUMBER(5)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>NUMBER(10)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>NUMBER(19)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>NUMBER(38,7)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>DECIMAL</jdbc-type>
+            <sql-type>NUMBER(38,15)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>NUMBER(38,15)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR2(255)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP(3)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP(9)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>BLOB</jdbc-type>
+            <sql-type>BLOB</sql-type>
+            <!--
+            | Change this from BLOB to RAW(n) if you know your
+            | serialized object will be <= n bytes and n <= 2000
+            -->
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>Oracle8</name>
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>30</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>(?1 || ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substring</function-name>
+            <function-sql>substr(?1, ?2, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>length(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>instr(?2, ?1, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>abs(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>sqrt(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>NUMBER(1)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>NUMERIC</jdbc-type>
+            <sql-type>NUMBER(3)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>NUMERIC</jdbc-type>
+            <sql-type>NUMBER(5)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>NUMBER(10)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>NUMBER(19)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>NUMBER(38,7)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>DECIMAL</jdbc-type>
+            <sql-type>NUMBER(38,15)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>NUMBER(38,15)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR2(255)</sql-type>
+         </mapping>
+         <mapping>
+            <!--
+            | Note that you lose granularity here
+            | Use a numeric type and store milliseconds if you really need it
+            -->
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <!--
+            | Note that you lose granularity here
+            | Use a numeric type and store milliseconds if you really need it
+            -->
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>BLOB</jdbc-type>
+            <sql-type>BLOB</sql-type>
+            <!--
+            | Change this from BLOB to RAW(n) if you know your
+            | serialized object will be <= n bytes and n <= 2000
+            -->
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>Oracle7</name>
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>30</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>(?1 || ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substring</function-name>
+            <function-sql>substr(?1, ?2, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>length(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>instr(?2, ?1, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>abs(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>sqrt(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>NUMBER(1)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>NUMERIC</jdbc-type>
+            <sql-type>NUMBER(3)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>NUMERIC</jdbc-type>
+            <sql-type>NUMBER(5)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>NUMBER(10)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>NUMBER(19)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>NUMBER(38,7)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>NUMBER(38,15)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR2(255)</sql-type>
+         </mapping>
+         <mapping>
+            <!--
+            | Note that you lose granularity here
+            | Use a numeric type and store milliseconds if you really need it
+            -->
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <!--
+            | Note that you lose granularity here
+            | Use a numeric type and store milliseconds if you really need it
+            -->
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>LONGVARBINARY</jdbc-type>
+            <sql-type>LONG RAW</sql-type>
+            <!--
+            | Change this from LONG RAW to RAW(n) if you know your
+            | serialized object will be <= n bytes and n <= 2000
+            | Oracle only permits one LONG type per table
+            -->
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>Sybase</name>
+         <row-locking-template/>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>30</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+         	<function-name>length</function-name>
+         	<function-sql>char_length(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>BIT</sql-type>
+         </mapping>
+    <!-- Current Sybase JDBC drivers (jConnect 5.2) don't support
+    byte or short.  Unfortunately they'll be serialized.
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>TINYINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+    -->
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>NUMERIC</jdbc-type>
+            <sql-type>NUMERIC(38,0)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>REAL</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE PRECISION</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(255)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>SMALLDATETIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>JAVA_OBJECT</jdbc-type>
+            <sql-type>IMAGE</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>PostgreSQL</name>
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <auto-increment-template>?1</auto-increment-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>TRUE</true-mapping>
+         <false-mapping>FALSE</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>(?1 || ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substring</function-name>
+            <function-sql>substring(?1 FROM ?2 FOR ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>length(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>(CASE position(?1 in substring(?2 from ?3)) WHEN 0 THEN 0 ELSE position(?1 in substring(?2 from ?3)) + ?3 - 1 END)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>abs(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>sqrt(CAST(?1 AS double precision))</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>BOOLEAN</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>INT2</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>INT2</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INT4</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>INT8</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>FLOAT</jdbc-type>
+            <sql-type>FLOAT(7)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>FLOAT8</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR(1)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>TEXT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP with time zone</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP with time zone</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>NUMERIC</jdbc-type>
+            <sql-type>NUMERIC</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>VARBINARY</jdbc-type>
+            <sql-type>BYTEA</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>PostgreSQL 8.0</name>
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <auto-increment-template>?1</auto-increment-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>TRUE</true-mapping>
+         <false-mapping>FALSE</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>(?1 || ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substring</function-name>
+            <function-sql>substring(?1 FROM ?2 FOR ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>length(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>(CASE position(?1 in substring(?2 from ?3)) WHEN 0 THEN 0 ELSE position(?1 in substring(?2 from ?3)) + ?3 - 1 END)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>abs(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>sqrt(CAST(?1 AS double precision))</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BOOLEAN</jdbc-type>
+            <sql-type>BOOLEAN</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>INT2</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>INT2</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INT4</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>INT8</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>FLOAT</jdbc-type>
+            <sql-type>FLOAT(7)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>FLOAT8</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR(1)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>TEXT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>NUMERIC</jdbc-type>
+            <sql-type>NUMERIC</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>VARBINARY</jdbc-type>
+            <sql-type>BYTEA</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>PostgreSQL 7.2</name>
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <auto-increment-template>?1</auto-increment-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>TRUE</true-mapping>
+         <false-mapping>FALSE</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>(?1 || ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substring</function-name>
+            <function-sql>substring(?1 FROM ?2 FOR ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>length(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>(CASE position(?1 in substring(?2 from ?3)) WHEN 0 THEN 0 ELSE position(?1 in substring(?2 from ?3)) + ?3 - 1 END)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>abs(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>sqrt(CAST(?1 AS double precision))</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>BOOLEAN</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>INT2</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>INT2</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INT4</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>INT8</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>FLOAT</jdbc-type>
+            <sql-type>FLOAT(7)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>FLOAT8</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR(1)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>TEXT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>NUMERIC</jdbc-type>
+            <sql-type>NUMERIC</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>VARBINARY</jdbc-type>
+            <sql-type>BYTEA</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>Hypersonic SQL</name>
+         <row-locking-template/>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <auto-increment-template>?1 IDENTITY</auto-increment-template>
+         <add-column-template>ALTER TABLE ?1 ADD COLUMN ?2 ?3</add-column-template>
+         <drop-column-template>ALTER TABLE ?1 DROP COLUMN ?2</drop-column-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>(1=1)</true-mapping>
+         <false-mapping>(1=0)</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>(?1 || ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substring</function-name>
+            <function-sql>SUBSTRING(?1, ?2, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lcase(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>LENGTH(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>LOCATE(?1, ?2, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>ABS(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>SQRT(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>ucase(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>BIT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <!-- hsqldb only supports directly serializable objects for sql type OBJECT -->
+            <jdbc-type>VARBINARY</jdbc-type>
+            <sql-type>VARBINARY</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>REAL</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>BIGINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>DECIMAL</jdbc-type>
+            <sql-type>DECIMAL</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>PointBase</name>
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>TRUE</true-mapping>
+         <false-mapping>FALSE</false-mapping>
+
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>position(?1 IN ?2)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>FLOAT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>FLOAT</jdbc-type>
+            <sql-type>FLOAT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>BOOLEAN</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>BLOB</jdbc-type>
+            <sql-type>BLOB</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>SOLID</name>
+         <row-locking-template/>
+         <pk-constraint-template>PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>TINYINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>BLOB</jdbc-type>
+            <sql-type>BLOB</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>BIT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>FLOAT</jdbc-type>
+            <sql-type>FLOAT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>BIGINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>mySQL</name>
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <!-- does not work for compound keys <fk-constraint-template>ALTER TABLE ?1 ADD INDEX ind_?3 (?3), ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+              <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         -->
+         <fk-constraint-template>ALTER TABLE ?1 ADD INDEX (?3), ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <auto-increment-template>?1 auto_increment</auto-increment-template>
+         <alter-column-template>ALTER TABLE ?1 MODIFY ?2 ?3</alter-column-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>false</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>concat(?1, ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substring</function-name>
+            <function-sql>substring(?1 FROM ?2 FOR ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>length(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>locate(?1, ?2, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>abs(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>sqrt(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>FLOAT</jdbc-type>
+            <sql-type>FLOAT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>TINYINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>BLOB</jdbc-type>
+            <sql-type>LONGBLOB</sql-type>
+            <!--
+            | Change this from LONGBLOB to BLOB if you know your
+            | serialized object will be <= 2^16 bytes
+            -->
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+            <!--
+            | This type is problematical because mysql does not have any
+            | date/time types that store milliseconds. You should avoid it.
+            -->
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>TINYINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>BIGINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(250) BINARY</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+            <!--
+            | Note that you lose granularity here
+            | Use a numeric type and store milliseconds if you really need it
+            -->
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>MS SQLSERVER</name>
+         <row-locking-template>SELECT ?1 FROM ?2 with (updlock) WHERE ?3 ORDER BY ?4</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <auto-increment-template>?1 IDENTITY</auto-increment-template>
+         <alter-column-template>ALTER TABLE ?1 ALTER COLUMN ?2 ?3</alter-column-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>(?1 + ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substring</function-name>
+            <function-sql>substring(?1, ?2, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>len(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>charindex(?1, ?2, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>abs(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>sqrt(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>DECIMAL</jdbc-type>
+            <sql-type>DECIMAL(20)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>JAVA_OBJECT</jdbc-type>
+            <sql-type>IMAGE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>TINYINT</sql-type>
+         </mapping>
+         <mapping>
+            <!--
+            | Note that you lose granularity here
+            | Use a numeric type and store milliseconds if you really need it
+            -->
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>BIT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>FLOAT</jdbc-type>
+            <sql-type>FLOAT</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>MS SQLSERVER2000</name>
+         <!--
+         | This type-mapping applies both to MS SQLSERVER 2000 and MS SQLSERVER 2005
+         -->          
+         <row-locking-template>SELECT ?1 FROM ?2 with (xlock) WHERE ?3 ORDER BY ?4</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <auto-increment-template>?1 IDENTITY</auto-increment-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>concat</function-name>
+            <function-sql>(?1 + ?2)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>substring</function-name>
+            <function-sql>substring(?1, ?2, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>lcase</function-name>
+            <function-sql>lower(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>length</function-name>
+            <function-sql>len(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>locate</function-name>
+            <function-sql>charindex(?1, ?2, ?3)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>abs</function-name>
+            <function-sql>abs(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>sqrt</function-name>
+            <function-sql>sqrt(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>ucase</function-name>
+            <function-sql>upper(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+         <function-mapping>
+            <function-name>mod</function-name>
+            <function-sql>(?1 % ?2)</function-sql>
+         </function-mapping>
+         
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>BIGINT</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>LONGVARBINARY</jdbc-type>
+            <sql-type>IMAGE</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>TINYINT</sql-type>
+         </mapping>
+
+         <mapping>
+            <!--
+            | Note that you lose granularity here
+            | Use a numeric type and store milliseconds if you really need it
+            -->
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATETIME</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>BIT</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>REAL</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>FLOAT</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>DB2/400</name>
+         <row-locking-template/>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>18</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR(1)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+    <!-- Apparent DB2/400 doesn't handle Byte type either
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR(1) FOR BIT DATA</sql-type>
+         </mapping>
+    -->
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>FLOAT</jdbc-type>
+            <sql-type>FLOAT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR(5)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>JAVA_OBJECT</jdbc-type>
+            <sql-type>VARCHAR(4096) FOR BIT DATA</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>SapDB</name>
+         <!-- SapDB 7.3 might require '... UPDATE OF ?1' in the row-locking-template -->
+         <!-- as is works with SapDB 7.4 -->
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD FOREIGN KEY ?2 (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>JAVA_OBJECT</jdbc-type>
+            <sql-type>LONG BYTE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>CHAR BYTE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>BOOLEAN</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>FLOAT</jdbc-type>
+            <sql-type>FLOAT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE PRECISION</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>DECIMAL</jdbc-type>
+            <sql-type>DECIMAL(20)</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>MaxDB</name>
+         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD FOREIGN KEY ?2 (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+             <auto-increment-template>?1</auto-increment-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>true</true-mapping>
+         <false-mapping>false</false-mapping>
+
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>JAVA_OBJECT</jdbc-type>
+            <sql-type>LONG BYTE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>CHAR BYTE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BOOLEAN</jdbc-type>
+            <sql-type>BOOLEAN</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>FLOAT</jdbc-type>
+            <sql-type>FLOAT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE PRECISION</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>DECIMAL</jdbc-type>
+            <sql-type>DECIMAL(20)</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+         <name>Cloudscape</name>
+         <row-locking-template/>
+         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>LONGVARCHAR</jdbc-type>
+            <sql-type>LONG VARCHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>BOOLEAN</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>TINYINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>LONGINT</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>REAL</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE PRECISION</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>LONGVARCHAR</jdbc-type>
+            <sql-type>LONG VARCHAR</sql-type>
+         </mapping>
+         <!-- NOTE: This alternative mapping has been suggested for cloudscape
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(256)</sql-type>
+         </mapping> -->
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>TIMESTAMP</sql-type>
+         </mapping>
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>JAVA_OBJECT</jdbc-type>
+            <sql-type>LONG VARBINARY</sql-type>
+         </mapping>
+      </type-mapping>
+
+
+      <type-mapping>
+         <name>InformixDB</name>
+         <row-locking-template>select ?1 from ?2 where ?3 order by ?4 for update</row-locking-template>
+         <pk-constraint-template>PRIMARY KEY (?2) CONSTRAINT ?1</pk-constraint-template>
+         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT FOREIGN KEY (?3) REFERENCES ?4 (?5) CONSTRAINT ?2</fk-constraint-template>
+         <auto-increment-template>?1 serial(1)</auto-increment-template>
+         <alias-header-prefix>t</alias-header-prefix>
+         <alias-header-suffix>_</alias-header-suffix>
+         <alias-max-length>32</alias-max-length>
+         <subquery-supported>true</subquery-supported>
+         <true-mapping>1</true-mapping>
+         <false-mapping>0</false-mapping>
+
+         <function-mapping>
+            <function-name>count</function-name>
+            <function-sql>count(?1)</function-sql>
+         </function-mapping>
+
+         <mapping>
+            <java-type>java.lang.Character</java-type>
+            <jdbc-type>CHAR</jdbc-type>
+            <sql-type>CHAR(1)</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.String</java-type>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(255,0)</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.math.BigDecimal</java-type>
+            <jdbc-type>NUMERIC</jdbc-type>
+            <sql-type>DECIMAL</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Boolean</java-type>
+            <jdbc-type>BIT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Integer</java-type>
+            <jdbc-type>INTEGER</jdbc-type>
+            <sql-type>INTEGER</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Long</java-type>
+            <jdbc-type>BIGINT</jdbc-type>
+            <sql-type>NUMERIC(18,0)</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Float</java-type>
+            <jdbc-type>REAL</jdbc-type>
+            <sql-type>FLOAT</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Double</java-type>
+            <jdbc-type>DOUBLE</jdbc-type>
+            <sql-type>DOUBLE PRECISION</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Byte</java-type>
+            <jdbc-type>TINYINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Short</java-type>
+            <jdbc-type>SMALLINT</jdbc-type>
+            <sql-type>SMALLINT</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.util.Date</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATETIME YEAR TO FRACTION(3)</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.sql.Date</java-type>
+            <jdbc-type>DATE</jdbc-type>
+            <sql-type>DATE</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.sql.Time</java-type>
+            <jdbc-type>TIME</jdbc-type>
+            <sql-type>TIME</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.sql.Timestamp</java-type>
+            <jdbc-type>TIMESTAMP</jdbc-type>
+            <sql-type>DATETIME YEAR TO FRACTION(3)</sql-type>
+         </mapping>
+
+         <mapping>
+            <java-type>java.lang.Object</java-type>
+            <jdbc-type>BLOB</jdbc-type>
+            <sql-type>BLOB</sql-type>
+         </mapping>
+      </type-mapping>
+
+      <type-mapping>
+          <name>Mimer SQL</name>
+          <row-locking-template/>
+          <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
+          <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
+          <alias-header-prefix>t</alias-header-prefix>
+          <alias-header-suffix>_</alias-header-suffix>
+          <alias-max-length>32</alias-max-length>
+          <subquery-supported>true</subquery-supported>
+          <true-mapping>1</true-mapping>
+          <false-mapping>0</false-mapping>
+
+          <mapping>
+             <java-type>java.lang.Boolean</java-type>
+             <jdbc-type>BIT</jdbc-type>
+             <sql-type>SMALLINT</sql-type>
+          </mapping>
+
+          <mapping>
+             <java-type>java.lang.Byte</java-type>
+             <jdbc-type>TINYINT</jdbc-type>
+             <sql-type>SMALLINT</sql-type>
+          </mapping>
+
+          <mapping>
+             <java-type>java.lang.Short</java-type>
+             <jdbc-type>SMALLINT</jdbc-type>
+             <sql-type>SMALLINT</sql-type>
+          </mapping>
+
+          <mapping>
+             <java-type>java.lang.Integer</java-type>
+             <jdbc-type>INTEGER</jdbc-type>
+             <sql-type>INTEGER</sql-type>
+          </mapping>
+
+          <mapping>
+             <java-type>java.lang.Long</java-type>
+             <jdbc-type>BIGINT</jdbc-type>
+             <sql-type>BIGINT</sql-type>
+          </mapping>
+
+          <mapping>
+             <java-type>java.lang.Float</java-type>
+             <jdbc-type>REAL</jdbc-type>
+             <sql-type>REAL</sql-type>
+          </mapping>
+
+          <mapping>
+             <java-type>java.lang.Double</java-type>
+             <jdbc-type>DOUBLE</jdbc-type>
+             <sql-type>DOUBLE PRECISION</sql-type>
+          </mapping>
+
+          <mapping>
+             <java-type>java.lang.Character</java-type>
+             <jdbc-type>CHAR</jdbc-type>
+             <sql-type>CHAR</sql-type>
+          </mapping>
+
+          <mapping>
+             <java-type>java.lang.String</java-type>
+             <jdbc-type>VARCHAR</jdbc-type>
+             <sql-type>VARCHAR(5000)</sql-type>
+          </mapping>
+
+          <mapping>
+             <java-type>java.sql.Date</java-type>
+             <jdbc-type>DATE</jdbc-type>
+             <sql-type>DATE</sql-type>
+          </mapping>
+
+          <mapping>
+             <java-type>java.sql.Time</java-type>
+             <jdbc-type>TIME</jdbc-type>
+             <sql-type>TIME</sql-type>
+          </mapping>
+
+          <mapping>
+             <java-type>java.sql.Timestamp</java-type>
+             <jdbc-type>TIMESTAMP</jdbc-type>
+             <sql-type>TIMESTAMP</sql-type>
+          </mapping>
+
+          <mapping>
+             <java-type>java.lang.Object</java-type>
+             <jdbc-type>JAVA_OBJECT</jdbc-type>
+             <sql-type>VARBINARY(5000)</sql-type>
+          </mapping>
+       </type-mapping>
+   </type-mappings>
+
+   <entity-commands>
+      <!-- default command; doesn't support unknown-pk -->
+      <entity-command name="default"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.JDBCCreateEntityCommand"/>
+
+      <!-- variation on default that skips select before insert -->
+      <entity-command name="no-select-before-insert"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.JDBCCreateEntityCommand">
+         <attribute name="SQLExceptionProcessor">jboss.jdbc:service=SQLExceptionProcessor</attribute>
+      </entity-command>
+
+      <!-- fetches next key value with the specified sql statement -->
+      <entity-command name="pk-sql"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCPkSqlCreateCommand">
+         <!-- change to define SQL used to obtain key prior to insert -->
+         <attribute name="pk-sql">SELECT CURRENT_TIMESTAMP</attribute>
+      </entity-command>
+
+      <!-- this command requires auto-increment element for unknown-pk -->
+      <entity-command name="mysql-get-generated-keys"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCMySQLCreateCommand">
+         <!-- uncomment in case of XADataSource <attribute name="class-name">com.mysql.jdbc.jdbc2.optional.PreparedStatementWrapper</attribute>  -->
+      </entity-command>
+
+      <!-- this command requires the specified sequence to have been created -->
+      <entity-command name="oracle-sequence"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCOracleCreateCommand">
+         <attribute name="sequence">TEST_SEQUENCE</attribute>
+      </entity-command>
+
+      <!-- this command makes the use of a specific sequence for each table -->
+      <entity-command name="oracle-table-sequence"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCOracleSequenceCreateCommand">
+         <attribute name="sequence_name">%%t_seq</attribute>
+      </entity-command>
+
+      <!-- retrieves generated key of the record inserted into hsql db -->
+      <entity-command name="hsqldb-fetch-key"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCHsqldbCreateCommand">
+         <!-- uncomment to change SQL statement used to obtain identity
+         <attribute name="pk-sql">CALL IDENTITY()</attribute>
+         -->
+      </entity-command>
+
+      <!-- retrieves generated key of the record inserted into sybase db -->
+      <entity-command name="sybase-fetch-key"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCSybaseCreateCommand"/>
+
+      <!-- retrieves generated key of the record inserted into SQLServer db -->
+      <entity-command name="mssql-fetch-key"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCSQLServerCreateCommand">
+         <!-- uncomment for versions prior to SQL Server 2000
+         <attribute name="pk-sql">SELECT @@IDENTITY</attribute>
+         -->
+      </entity-command>
+
+      <!-- retrieves serial value of the record inserted into informix db -->
+      <entity-command name="informix-serial"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCInformixCreateCommand">
+         <!-- uncomment to use with SERIAL8 column
+         <attribute name="method">getSerial8</attribute>
+         -->
+      </entity-command>
+
+      <!-- retrieves the currval of the the sequence associated with a PostgreSQL SERIAL column -->
+      <entity-command name="postgresql-fetch-seq"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCPostgreSQLCreateCommand">
+         <!-- uncomment to change the name of the sequence; default is ${table}_${pkColumn}_seq
+         <attribute name="sequence"></attribute>
+         -->
+      </entity-command>
+
+      <!-- uses key generator to fetch the next key value -->
+      <entity-command name="key-generator"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCKeyGeneratorCreateCommand">
+         <attribute name="key-generator-factory">UUIDKeyGeneratorFactory</attribute>
+      </entity-command>
+
+      <!-- uses JDBC 3.0 getGeneratedKeys() method -->
+      <entity-command name="get-generated-keys"
+                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBC30GeneratedKeysCreateCommand"/>
+
+      <!-- pk-sql for jdbc2 pm -->
+      <entity-command name="jdbc2pm-pk-sql"
+                      class="org.jboss.ejb.plugins.cmp.jdbc2.PkSqlCreateCommand">
+         <!-- change to define SQL used to obtain key prior to insert -->
+         <attribute name="pk-sql">SELECT CURRENT_TIMESTAMP</attribute>
+      </entity-command>
+
+      <!-- retrieves generated key of the record inserted into hsql db for jdbc2 pm -->
+      <entity-command name="jdbc2pm-hsqldb-fetch-key"
+                      class="org.jboss.ejb.plugins.cmp.jdbc2.keygen.HsqldbCreateCommand">
+         <!-- uncomment to change SQL statement used to obtain identity
+         <attribute name="pk-sql">CALL IDENTITY()</attribute>
+         -->
+      </entity-command>
+
+      <!-- retrieves the currval of the the sequence associated with a PostgreSQL SERIAL column for jdbc2 pm -->
+      <entity-command name="jdbc2pm-postgresql-fetch-seq"
+                      class="org.jboss.ejb.plugins.cmp.jdbc2.keygen.PostgreSQLCreateCommand">
+         <!-- uncomment to change the name of the sequence; default is ${table}_${pkColumn}_seq
+         <attribute name="sequence"></attribute>
+         -->
+      </entity-command>
+   </entity-commands>
+
+   <!-- reserved words that should not be used as table names -->
+   <!-- JBoss will escape them by prepending a 'X' -->
+   <reserved-words>
+      	<word>alias</word>   	
+      	<word>alter</word>
+      	<word>between</word>
+      	<word>char</word>      	
+      	<word>column</word>      	
+      	<word>commit</word>
+      	<word>create</word>
+      	<word>date</word>
+      	<word>default</word>
+      	<word>delete</word>
+      	<word>drop</word>
+      	<word>file</word>
+      	<word>from</word>
+      	<word>grant</word>
+      	<word>group</word>
+      	<word>index</word>
+      	<word>integer</word>
+      	<word>join</word>
+      	<word>number</word>
+      	<word>on</word>
+      	<word>order</word>
+      	<word>primary</word>
+      	<word>public</word>
+      	<word>revoke</word>
+      	<word>rollback</word>
+      	<word>row</word>
+      	<word>select</word>
+      	<word>set</word>
+      	<word>session</word>
+      	<word>size</word>      	
+      	<word>table</word>
+      	<word>trigger</word>
+      	<word>update</word>
+      	<word>unique</word>
+      	<word>user</word>
+      	<word>varchar</word>
+      	<word>view</word>
+    </reserved-words>
+</jbosscmp-jdbc>


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/standardjbosscmp-jdbc.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/all/xmdesc (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/xmdesc)


Property changes on: branches/Branch_5_x/server/src/etc/conf/all/xmdesc
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: branches/Branch_5_x/server/src/etc/conf/default/bootstrap/aop.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/bootstrap/aop.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap/aop.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   AOP configuration
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <classloader><inject bean="aop-classloader:0.0.0"/></classloader>
-
-   <classloader name="aop-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
-      <root>${jboss.lib.url}jboss-aop-asintegration-core.jar</root>
-      <root>${jboss.lib.url}jboss-aop-asintegration-jmx.jar</root>
-      <root>${jboss.lib.url}jboss-aop-asintegration-mc.jar</root>
-      <root>${jboss.lib.url}jboss-aop-deployers.jar</root>
-      <root>${jboss.lib.url}jboss-aop-jboss5.jar</root>
-   </classloader>
-
-   <!-- Integration -->
-   <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
-   
-   <bean name="AOPClassPoolFactory" class="org.jboss.aop.classpool.jbosscl.JBossClDelegatingClassPoolFactory">
-      <constructor>
-         <parameter><inject bean="AOPClassLoaderScopingPolicy" property="registry"/></parameter>
-         <parameter><inject bean="AOPRegisterModuleCallback"/></parameter>
-      </constructor>
-   </bean>
-
-   <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
-      <property name="classPoolFactory"><inject bean="AOPClassPoolFactory"/></property>
-      <property name="aopClassLoaderScopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
-   </bean>
-
-   <bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
-      <property name="managerBean">AspectManager</property>
-      <property name="managerProperty">aspectManager</property>
-   </bean>
-
-   <!-- bean name="AOPBootstrap" class="org.jboss.aop.asintegration.jboss5.AOPBootstrap" -->
-      <!--  This one lives in AS 5 source tree -->
-      <!-- property name="policy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
-       <property name="manager"><inject bean="AspectManager" property="aspectManager"/></property>
-   </bean-->
-
-   <bean name="AOPRegisterModuleCallback" class="org.jboss.aop.asintegration.jboss5.RegisterModuleCallback">
-      <!-- classloader><null/></classloader -->
-      <incallback method="addModule" state="Installed"/>
-      <uncallback method="removeModule" state="Installed"/>
-   </bean>
-   <!--
-      Valid values for the AspectManager bean for use with enableTransformer=true are:
-      * org.jboss.aop.deployers.AspectManagerJDK5 - works with the -javaagent:pluggable-instrumentor.jar switch
-      * org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and the -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor switch
-   -->
-   <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
-      <constructor>
-         <parameter><![CDATA[
-	         <aop>
-			      <aspect name="mainDeployer" class="org.jboss.profileservice.aop.MainDeployerAspect"/>
-					   <bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployment.MainDeployer}->process(..))">
-				      <advice name="process" aspect="mainDeployer"/>
-				   </bind>
-					<aspect name="persist" class="org.jboss.profileservice.aop.PersistAspect"/>
-					<bind pointcut="execution(* $instanceof{org.jboss.managed.api.ManagedProperty}->setValue(..))">
-				      <advice name="setValue" aspect="persist"/>
-				   </bind>
-				</aop>]]>
-	      </parameter>
-      </constructor>
-
-      <property name="jbossIntegration"><inject bean="AOPJBossIntegration"/></property>
-
-      <property name="enableLoadtimeWeaving">false</property>
-      <!-- only relevant when EnableLoadtimeWeaving is true.
-           When transformer is on, every loaded class gets
-           transformed.  If AOP can't find the class, then it
-           throws an exception.  Sometimes, classes may not have
-           all the classes they reference.  So, the Suppressing
-           is needed.  (i.e. Jboss cache in the default configuration -->
-      <property name="suppressTransformationErrors">true</property>
-      <property name="prune">true</property>
-      <property name="include">org.jboss.test., org.jboss.injbossaop.</property>
-      <property name="exclude">org.jboss.</property>
-      <!-- This avoids instrumentation of hibernate cglib enhanced proxies
-      <property name="ignore">*$$EnhancerByCGLIB$$*</property> -->
-      <property name="optimized">true</property>
-      <property name="verbose">false</property>
-      <!--
-         Available choices for this attribute are:
-            org.jboss.aop.instrument.ClassicInstrumentor (default)
-            org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
-       <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
-      -->
-	  <!-- 
-		By default the deployment of the aspects contained in 
-		../deployers/jboss-aop-jboss5.deployer/base-aspects.xml
-		are not deployed. To turn on deployment uncomment this property
-	  <property name="useBaseXml">true</property>
-	  -->
-   </bean>
-
-</deployment>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/bootstrap/bindings.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/bootstrap/bindings.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap/bindings.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <classloader><inject bean="bindings-classloader:0.0.0"/></classloader>
-
-   <classloader name="bindings-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
-      <root>${jboss.common.lib.url}jboss-bindingservice.jar</root>
-   </classloader>
-
-   <bean name="ServiceBindingManager" class="org.jboss.services.binding.ServiceBindingManager">
-
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.system:service=ServiceBindingManager", exposedInterface=org.jboss.services.binding.ServiceBindingManagerMBean.class, registerDirectly=true)</annotation>
-            
-      <constructor>
-         <!-- The name of the set of bindings to use for this server -->
-         <parameter>${jboss.service.binding.set:ports-default}</parameter>
-
-         <!-- The named sets of bindings -->
-         <parameter>
-            <bean name="ServiceBindingStore" class="org.jboss.services.binding.impl.PojoServiceBindingStore">
-
-               <!-- Base bindings that are used to create bindings for each set -->
-               <property name="standardBindings"><inject bean="StandardBindings"/></property>
-               
-               <!-- The sets of bindings -->
-               <property name="serviceBindingSets">
-                  <set>
-                     <inject bean="PortsDefaultBindings"/>
-                     <inject bean="Ports01Bindings"/>
-                     <inject bean="Ports02Bindings"/>
-                     <inject bean="Ports03Bindings"/>
-                  </set>
-               </property>
-            </bean>
-         </parameter>
-      </constructor>
-
-   </bean>
-
-   <!-- The ports-default bindings are obtained by taking the base bindings and adding 0 to each port value  -->
-   <bean name="PortsDefaultBindings"  class="org.jboss.services.binding.impl.ServiceBindingSet">
-      <constructor>
-         <!--  The name of the set -->
-         <parameter>ports-default</parameter>
-         <!-- Default host name -->
-         <parameter>${jboss.bind.address}</parameter>
-         <!-- The port offset -->
-         <parameter>0</parameter>
-         <!-- Set of bindings to which the "offset by X" approach can't be applied -->
-         <parameter><null/></parameter>
-      </constructor>
-   </bean>
-
-   <!-- The ports-01 bindings are obtained by taking the base bindings and adding 100 to each port value -->
-   <bean name="Ports01Bindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
-      <constructor>
-         <!--  The name of the set -->
-         <parameter>ports-01</parameter>
-         <!-- Default host name -->
-         <parameter>${jboss.bind.address}</parameter>
-         <!-- The port offset -->
-         <parameter>100</parameter>
-         <!-- Set of bindings to which the "offset by X" approach can't be applied -->
-         <parameter><null/></parameter>
-      </constructor>
-   </bean>
-
-   <!-- The ports-02 bindings are obtained by taking ports-default and adding 200 to each port value -->
-   <bean name="Ports02Bindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
-      <constructor>
-         <!--  The name of the set -->
-         <parameter>ports-02</parameter>
-         <!-- Default host name -->
-         <parameter>${jboss.bind.address}</parameter>
-         <!-- The port offset -->
-         <parameter>200</parameter>
-         <!-- Set of bindings to which the "offset by X" approach can't be applied -->
-         <parameter><null/></parameter>
-      </constructor>
-   </bean>
-
-   <!-- The ports-03 bindings are obtained by taking ports-default and adding 300 to each port value -->
-   <bean name="Ports03Bindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
-      <constructor>
-         <!--  The name of the set -->
-         <parameter>ports-03</parameter>
-         <!-- Default host name -->
-         <parameter>${jboss.bind.address}</parameter>
-         <!-- The port offset -->
-         <parameter>300</parameter>
-         <!-- Set of bindings to which the "offset by X" approach can't be applied -->
-         <parameter><null/></parameter>
-      </constructor>
-   </bean>
-
-   <!-- Base binding metadata that ServiceBindingStore uses to create bindings for each set -->
-   <bean name="StandardBindings" class="java.util.HashSet">
-      <constructor>
-         <parameter class="java.util.Collection">
-            <set elementClass="org.jboss.services.binding.ServiceBindingMetadata">
-            <!-- ********************* conf/jboss-service.xml ****************** -->
-
-            <!-- Naming Service -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss:service=Naming</property>
-               <property name="bindingName">Port</property>
-               <property name="port">1099</property>
-            </bean>
-
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss:service=Naming</property>
-               <property name="bindingName">RmiPort</property>
-               <property name="port">1098</property>
-            </bean>
-
-            <!-- Remote classloading service -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss:service=WebService</property>
-               <property name="port">8083</property>
-            </bean>
-
-            <!-- Remoting Connector -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">UnifiedInvokerConnector</property>
-               <property name="port">4446</property>
-            </bean>
-            
-            <!-- Used to create a multihome Remoting server.   See -->
-            <!-- deploy/remoting-jboss-beans.xml for more details. -->
-            <!--bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">UnifiedInvokerConnector:bindingHome1</property>
-               <parameter>192.168.2.2</property>
-               <property name="port">7777</property>
-            </bean-->
-            
-            <!-- Used to create a multihome Remoting server.   See -->
-            <!-- deploy/remoting-jboss-beans.xml for more details. -->
-            <!--bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">UnifiedInvokerConnector:bindingHome2</property>
-               <parameter>10.11.12.238</property>
-               <property name="port">8888</property>
-            </bean-->
-
-            <!-- ********************* deploy/legacy-invokers-service.xml ****************** -->
-
-            <!-- RMI/JRMP invoker -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss:service=invoker,type=jrmp</property>
-               <property name="port">4444</property>
-            </bean>
-
-            <!-- Pooled invoker -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss:service=invoker,type=pooled</property>
-               <property name="port">4445</property>
-            </bean>
-
-            <!-- ********************* deploy/cluster/hajndi-service.xml ****************** -->
-
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss:service=HAJNDI</property>
-               <property name="bindingName">Port</property>
-               <property name="port">1100</property>
-            </bean>
-
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss:service=HAJNDI</property>
-               <property name="bindingName">RmiPort</property>
-               <property name="port">1101</property>
-            </bean>
-
-            <!-- ********************* deploy/cluster/ha-legacy-service.xml ****************** -->
-
-            <!-- HA RMI/JRMP invoker -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss:service=invoker,type=jrmpha</property>
-               <property name="port">4447</property>
-            </bean>
-
-            <!-- HA Pooled invoker -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss:service=invoker,type=pooledha</property>
-               <property name="port">4448</property>
-            </bean>
-
-            <!-- ********************* deploy/iiop-service.xml ****************** -->
-
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss:service=CorbaORB</property>
-               <property name="port">3528</property>
-            </bean>
-
-            <!-- ********************* deploy/snmp-adaptor.sar **************** -->
-
-            <!-- Trap receiver that acts as an SNMP Manager -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss.jmx:name=SnmpAgent,service=trapd,type=logger</property>
-               <property name="port">1162</property>
-            </bean>
-
-            <!-- The SNMP adaptor MBean -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss.jmx:name=SnmpAgent,service=snmp,type=adaptor</property>
-               <property name="port">1161</property>
-            </bean>
-
-            <!-- ********************* deploy/jmx-remoting.sar **************** -->
-
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss.remoting:service=JMXConnectorServer,protocol=rmi</property>
-               <property name="port">1090</property>
-            </bean>
-
-            <!-- ********************* deploy/ejb3-connectors-service.xml **************** -->
-
-            <!-- EJB3 wants to have the service create its own ServiceBinding object
-                 dynamically.  See the value-factory usage in deploy/ejb3-connectors-service.xml -->
-
-
-            <!-- ********************* deploy/jbossweb.sar **************** -->
-            <!-- ********************* deploy/httpha-invoker.sar **************** -->
-
-            <!--
-                JBoss Web server.xml configuration.
-
-                Same binding config can be used by the following services, or really
-                anything else that needs to point to the JBoss Web HTTP connector
-                but doesn't need an XSL Transform
-
-                jboss:service=invoker,type=http
-                jboss:service=invoker,type=http,target=Naming
-                jboss:service=invoker,type=http,target=Naming,readonly=true
-                jboss:service=invoker,type=httpHA
-                jboss:service=invoker,type=http,target=HAJNDI
-                jboss.ws:service=ServiceEndpointManager
-            -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss.web:service=WebServer</property>
-               <property name="port">8080</property>
-
-               <!--
-                   Inject a XSLT transform configuration (see below) that describes
-                   how to transform server.xml
-                   If the binding value request doesn't require an XSL Transform, this config
-                   will be ignored.
-               -->
-               <property name="serviceBindingValueSourceConfig"><inject bean="JBossWebConnectorXSLTConfig"/></property>
-            </bean>
-
-            <!-- For services like those listed above that need to know the
-                 port of the HTTPS connector -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss.web:service=WebServer</property>
-               <property name="bindingName">HttpsConnector</property>
-               <property name="port">8443</property>
-            </bean>
-
-            <!-- ********************* deploy/messaging/remoting-bisocket-service.xml ********************** -->
-
-            <!-- Standard JBM bisocket connector -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss.messaging:service=Connector,transport=bisocket</property>
-               <property name="port">4457</property>
-            </bean>
-
-            <!-- ********************* deploy/transaction-jboss-beans.xml ********************** -->
-
-            <!-- JBossTS Recovery Manager -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-                <property name="serviceName">TransactionManager</property>
-                <property name="bindingName">recoveryManager</property>
-                <property name="port">4712</property>
-            </bean>
-
-            <!-- JBossTS Transaction Status Manager -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-                <property name="serviceName">TransactionManager</property>
-                <property name="bindingName">transactionStatusManager</property>
-                <property name="port">4713</property>
-            </bean>
-
-            <!-- JBossTS SocketProcessId.  The address part is ignored,
-                it will always use localhost/127.0.0.1. -->
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-                <property name="serviceName">TransactionManager</property>
-                <property name="bindingName">socketProcessId</property>
-                <property name="port">4714</property>
-            </bean>
-
-
-            <!-- ********************* deploy/hsqldb-ds.xml **************** -->
-
-            <!-- Commented out as tcp/ip access to Hypersonic is not enabled by default -->
-            <!--
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss:service=Hypersonic</property>
-               <property name="port">1701</property>
-            </bean>
-            -->
-
-            <!-- ********************* JBoss MQ **************** -->
-
-            <!-- Commented out as JBoss MQ is not installed by default
-                 If you uncomment this and also use jboss.mq:service=InvocationLayer,type=HTTP,
-                 configure the http invocation layer using the jboss.web:service=WebServer binding above
-             -->
-            <!--
-            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
-               <property name="serviceName">jboss.mq:service=InvocationLayer,type=UIL2</property>
-               <property name="port">8093</property>
-            </bean>
-            -->
-         </set>
-         </parameter>
-      </constructor>
-   </bean>
-
-   <!-- Conversion of selected bindings into system properties -->
-   <bean name="SystemPropertyBinder" class="org.jboss.services.binding.SystemPropertyBinder">
-
-      <constructor>
-         <parameter>
-            <set>
-               <!-- JBM's remoting connector -->
-               <bean class="org.jboss.services.binding.SystemPropertyBinding">
-                  <constructor>
-                     <parameter>jboss.messaging.connector.bisocket.port</parameter>
-                     <parameter class="int">
-                        <value-factory bean="ServiceBindingManager" method="getIntBinding"
-                                       parameter="jboss.messaging:service=Connector,transport=bisocket"/>
-                     </parameter>
-                  </constructor>
-               </bean>
-            </set>
-         </parameter>
-      </constructor>
-
-   </bean>
-
-   <!-- XSL Transform to apply to server.xml -->
-   <bean name="JBossWebConnectorXSLTConfig"
-         class="org.jboss.services.binding.impl.XSLTServiceBindingValueSourceConfig">
-
-      <constructor>
-          <parameter><![CDATA[
-   <xsl:stylesheet
-         xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
-
-     <xsl:output method="xml" />
-     <xsl:param name="port"/>
-
-     <xsl:variable name="portAJP" select="$port - 71"/>
-     <xsl:variable name="portHttps" select="$port + 363"/>
-
-     <xsl:template match="/">
-       <xsl:apply-templates/>
-     </xsl:template>
-
-      <xsl:template match = "Connector">
-         <Connector>
-            <xsl:for-each select="@*">
-            <xsl:choose>
-               <xsl:when test="(name() = 'port' and . = '8080')">
-                  <xsl:attribute name="port"><xsl:value-of select="$port" /></xsl:attribute>
-               </xsl:when>
-               <xsl:when test="(name() = 'port' and . = '8009')">
-                  <xsl:attribute name="port"><xsl:value-of select="$portAJP" /></xsl:attribute>
-               </xsl:when>
-               <xsl:when test="(name() = 'redirectPort')">
-                  <xsl:attribute name="redirectPort"><xsl:value-of select="$portHttps" /></xsl:attribute>
-               </xsl:when>
-               <xsl:when test="(name() = 'port' and . = '8443')">
-                  <xsl:attribute name="port"><xsl:value-of select="$portHttps" /></xsl:attribute>
-               </xsl:when>
-               <xsl:otherwise>
-                  <xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>
-               </xsl:otherwise>
-            </xsl:choose>
-            </xsl:for-each>
-            <xsl:apply-templates/>
-         </Connector>
-      </xsl:template>
-
-     <xsl:template match="*|@*">
-       <xsl:copy>
-         <xsl:apply-templates select="@*|node()"/>
-       </xsl:copy>
-     </xsl:template>
-   </xsl:stylesheet>
-   ]]>
-          </parameter>
-      </constructor>
-   </bean>
-
-</deployment>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/bootstrap/classloader.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/bootstrap/classloader.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap/classloader.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   The core classloading system
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <classloader><inject bean="bootstrap-classloader:0.0.0"/></classloader>
-
-   <!--
-      The classloader implementation
-   -->
-   <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
-      <classloader><null/></classloader>
-      <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
-   </bean>
-
-   <!-- 
-      ClassLoader management and resolution
-   -->
-   <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
-      <classloader><null/></classloader>
-      <incallback method="addModule" state="Configured"/>
-      <uncallback method="removeModule" state="Configured"/>
-   </bean>
-
-   <classloader name="bootstrap-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
-      <!-- System -->
-      <root>${jboss.lib.url}jboss-system.jar</root>
-   </classloader>
-   
-</deployment>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/bootstrap/deployers.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/bootstrap/deployers.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap/deployers.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   The base deployers
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <classloader><inject bean="deployers-classloader:0.0.0"/></classloader>
-
-   <classloader name="deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
-      <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root>
-      <root>${jboss.lib.url}jboss-deployers-core.jar</root>
-      <root>${jboss.lib.url}jboss-deployers-client-spi.jar</root>
-      <root>${jboss.lib.url}jboss-deployers-client.jar</root>
-      <root>${jboss.lib.url}jboss-deployers-structure-spi.jar</root>
-      <root>${jboss.lib.url}jboss-deployers-spi.jar</root>
-      <root>${jboss.lib.url}jboss-deployers-impl.jar</root>
-      <root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root>
-      <root>${jboss.lib.url}jboss-deployers-vfs.jar</root>
-     <!-- Bean annotation handling -->
-      <root>${jboss.lib.url}jboss-dependency.jar</root>
-      <root>${jboss.lib.url}jboss-kernel.jar</root>
-
-      <!-- JAXB impl here, api is in endorsed -->
-      <root>${jboss.lib.url}jaxb-impl.jar</root>
-      <!-- STAX2 impl here, api is in endorsed -->
-      <root>${jboss.lib.url}wstx.jar</root>
-   </classloader>
-
-  <!-- use legacy ordering -->
-   <bean name="topContextComparator">
-     <constructor factoryClass="org.jboss.system.deployers.LegacyDeploymentContextComparator" factoryMethod="getInstance"/>
-   </bean>
-
-   <!-- MetaValueFactory -->
-   <bean name="MetaValueFactory" >
-      <constructor factoryClass="org.jboss.metatype.api.values.MetaValueFactory" factoryMethod="getInstance"/>      
-   </bean>
-   <!-- The ManagedObjectFactory -->
-   <bean name="ManagedObjectFactory">
-      <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/>
-      <!-- Accept any implementor of InstanceClassFactory -->
-      <incallback method="addInstanceClassFactory"/>
-      <uncallback method="removeInstanceClassFactory"/>
-     <!-- Accept any ManagedObjectDefinition -->
-      <incallback method="addManagedObjectDefinition"/>
-      <uncallback method="removeManagedObjectDefinition"/>
-      <property name="metaValueFactory"><inject bean="MetaValueFactory"/></property>
-   </bean>
-   <!-- The ManagedObjectCreator implementation -->
-   <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
-      <property name="mof"><inject bean="ManagedObjectFactory"/></property>
-   </bean>
-
-   <!-- The MainDeployer -->
-   <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
-      <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
-      <property name="deployers"><inject bean="Deployers"/></property>
-      <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
-      <property name="comparator"><inject bean="topContextComparator"/></property>
-   </bean>
-
-   <!-- The ManagedDeploymentCreator implementation that supports mapping
-      attachment types to ManagedDeployment#getTypes
-   -->
-   <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.TypedManagedDeploymentCreator" />
-
-   <!-- ModificationType structure processor -->
-   <bean name="ModificationTypeStructureProcessor" class="org.jboss.deployers.vfs.plugins.structure.modify.ModificationTypeStructureProcessor">
-     <incallback method="addMatcher"/>
-     <uncallback method="removeMatcher"/>
-   </bean>
-
-   <!-- The holder for deployers that determine structure -->
-   <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
-      <property name="structureBuilder">
-         <!-- The consolidator of the structure information -->
-         <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder">
-           <property name="structureProcessor"><inject bean="ModificationTypeStructureProcessor"/></property>
-         </bean>
-      </property>
-      <!-- Accept any implementor of structure deployer -->
-      <incallback method="addDeployer"/>
-      <uncallback method="removeDeployer"/>
-   </bean>
-
-   <!-- The holder for deployers that do real deployment -->
-   <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.deployment:service=DeployersImpl", exposedInterface=org.jboss.deployers.plugins.deployers.DeployersImplMBean.class, registerDirectly=true)</annotation>
-      <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
-      <!-- Accept any implementor of deployer -->
-      <incallback method="addDeployer"/>
-      <uncallback method="removeDeployer"/>
-      <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
-   </bean>
-
-   <!-- A declared structure descriptor deployer -->
-   <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
-
-    <!-- JAR Structure -->
-    <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
-       <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop -->
-       <constructor>
-          <parameter>
-             <set elementClass="java.lang.String">
-                <value>.zip</value>
-                <value>.ear</value>
-                <value>.jar</value>
-                <value>.rar</value>
-                <value>.war</value>
-                <value>.sar</value>
-                <value>.har</value>
-                <value>.aop</value>
-                <value>.deployer</value>
-                <value>.beans</value>
-             </set>
-          </parameter>
-       </constructor>
-       <property name="candidateStructureVisitorFactory">
-          <!-- Any file that is not an ordinary directory is a candidate -->
-          <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
-             <!-- A filter to exclude some obvious non-subdeployments -->
-             <property name="filter">
-                <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
-                   <constructor><parameter>
-                      <list elementClass="java.lang.String">
-                         <!-- Exclude class files as subdeployments -->
-                         <value>.class</value>
-                      </list>
-                   </parameter></constructor>
-                </bean>
-             </property>
-          </bean>
-       </property>
-    </bean>
-
-    <!-- File Structure -->
-    <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
-       <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
-       <constructor>
-          <parameter>
-             <set elementClass="java.lang.String">
-                <value>-service.xml</value>
-                <value>-beans.xml</value>
-                <value>-ds.xml</value>
-                <value>-aop.xml</value>
-             </set>
-          </parameter>
-       </constructor>
-    </bean>
-
-    <!-- Old AOP deployment 
-    <bean name="AspectAppParsingDeployer" class="org.jboss.aop.asintegration.jboss5.AspectAppParsingDeployer"/>
-    <bean name="AspectDeployer" class="org.jboss.aop.asintegration.jboss5.AspectDeployer">
-       <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
-   </bean>
-   -->
-
-   <bean name="AOPXMLMetaDataParserDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
-      <constructor>
-         <parameter>org.jboss.aop.microcontainer.beans.metadata.AOPDeployment</parameter>
-      </constructor>
-      <property name="suffix">-aop.xml</property>
-   </bean>
-   <bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer">
-      <constructor>
-         <parameter><inject bean="AOPXMLMetaDataParserDeployer" property="relativeOrder"/></parameter>
-      </constructor>
-   </bean>
-   <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer">
-      <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
-   </bean>
-   <bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer">
-      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
-      <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
-   </bean>
-   <bean name="BeansDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.BeansDeploymentAopMetaDataDeployer">
-      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
-      <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
-   </bean>
-
-   <!-- POJO Deployment -->
-  
-   <bean name="CoreBeanAnnotationAdapterFactory">
-      <constructor factoryClass="org.jboss.kernel.plugins.annotations.BeanAnnotationAdapterFactory" factoryMethod="getInstance"/>
-   </bean>
-
-   <bean name="CoreBeanAnnotationAdapter">
-      <constructor factoryMethod="getBeanAnnotationAdapter">
-        <factory bean="CoreBeanAnnotationAdapterFactory"/>
-      </constructor>
-      <incallback method="addAnnotationPlugin"/>
-      <uncallback method="removeAnnotationPlugin"/>
-   </bean>
-
-   <bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF">
-      <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
-      <property name="delegateICF"><inject bean="ManagedObjectFactory" property="defaultInstanceFactory"/></property>
-   </bean>
-   <bean name="KernelDeploymentManagedObjectCreator" class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator">
-      <constructor><parameter><inject bean="ManagedObjectFactory"/></parameter></constructor>
-   </bean>
-   <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
-      <property name="suffix">jboss-beans.xml</property>
-   </bean>
-   <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer">
-      <install bean="ManagedDeploymentCreator" method="addAttachmentType">
-         <parameter>
-            <value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
-         </parameter>
-         <parameter>
-            <value>beans</value>
-         </parameter>
-      </install>
-      <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
-         <parameter>
-            <value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
-         </parameter>        
-      </uninstall>
-      <property name="mgtObjectCreator"><inject bean="KernelDeploymentManagedObjectCreator"/></property>
-   </bean>
-   <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
-      <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
-   </bean>
-
-   <!-- JMX Deployment -->
-   <bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF">
-      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
-      <property name="controller"><inject bean="JMXKernel" property="serviceController"/></property>
-   </bean>
-   <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer"/>
-   <bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer"/>
-   <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer"/>
-   <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
-       <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
-   </bean>
-
-   <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
-      <constructor>
-         <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
-      </constructor>
-      <property name="name">jboss-classloading.xml</property>
-      <property name="buildManagedObject">true</property>
-   </bean>
-   <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
-      <property name="defaultMetaData">
-         <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
-      </property>
-   </bean>
-   <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/>
-   <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
-   <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
-      <property name="classLoading"><inject bean="ClassLoading"/></property>
-   </bean>
-   <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
-      <property name="classLoading"><inject bean="ClassLoading"/></property>
-      <property name="system"><inject bean="ClassLoaderSystem"/></property>
-   </bean>
-   
-</deployment>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/bootstrap/jmx.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/bootstrap/jmx.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap/jmx.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   The JMX Subsystem
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <classloader><inject bean="jmx-classloader:0.0.0"/></classloader>
-
-   <classloader name="jmx-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
-      <root>${jboss.lib.url}jboss-j2se.jar</root>
-      <root>${jboss.lib.url}jboss-mbeans.jar</root>
-      <root>${jboss.lib.url}jboss-jmx.jar</root>
-      <root>${jboss.lib.url}jboss-system-jmx.jar</root>
-      <root>${jboss.lib.url}dom4j.jar</root>
-   </classloader>
-
-   <bean name="ServerInfo" class="org.jboss.system.server.ServerInfo">
-      <alias>jboss.system:type=ServerInfo</alias>
-   </bean>
-
-   <!-- The legacy JMX kernel -->
-   <bean name="JMXKernel" class="org.jboss.system.server.jmx.JMXKernel">
-      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
-      <property name="serverImpl"><inject bean="JBossServer"/></property>
-      <property name="serverInfo"><inject bean="ServerInfo"/></property>
-   </bean>
-   
-   <!-- Support for @JMX -->
-   <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
-               name="JMXRegistrationAdvice"
-               class="org.jboss.system.microcontainer.jmx.ServiceControllerRegistrationLifecycleCallback"
-               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
-               manager-bean="AspectManager"
-               manager-property="aspectManager">
-      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
-   </lifecycle-configure>
-   <lifecycle-create xmlns="urn:jboss:aop-beans:1.0"
-               name="JMXCreateDestroyAdvice"
-               class="org.jboss.system.microcontainer.jmx.ServiceControllerCreateDestroyLifecycleCallback"
-               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
-               manager-bean="AspectManager"
-               manager-property="aspectManager">
-      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
-   </lifecycle-create>
-   <lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
-               name="JMXStartStopAdvice"
-               class="org.jboss.system.microcontainer.jmx.ServiceControllerStartStopLifecycleCallback"
-               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
-               manager-bean="AspectManager"
-               manager-property="aspectManager">
-      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
-   </lifecycle-install>
-
-	<!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
-	<bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
-	   <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
-	   <property name="aspectManager"><inject bean="AspectManager" property="delegate"/></property>
-	</bean>
-
-</deployment>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/bootstrap/logging.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/bootstrap/logging.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap/logging.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   The Logging Subsystem
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-    <bean name="LogBridgeHandler" class="org.jboss.logbridge.LogBridgeHandler"/>
-
-</deployment>
\ No newline at end of file

Deleted: branches/Branch_5_x/server/src/etc/conf/default/bootstrap/vfs.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/bootstrap/vfs.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap/vfs.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   The JBossVFS initializer configuration.
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="VFSCache">
-    <constructor factoryClass="org.jboss.virtual.spi.cache.VFSCacheFactory" factoryMethod="getInstance">
-      <!-- Use the CombinedVFSCache implementation -->
-      <parameter>org.jboss.virtual.plugins.cache.CombinedVFSCache</parameter>
-    </constructor>
-    <start ignored="true"/>
-    <property name="permanentRoots">
-      <map keyClass="java.net.URL" valueClass="org.jboss.virtual.spi.ExceptionHandler">
-        <entry>
-          <key>${jboss.lib.url}</key>
-          <value><null/></value>
-        </entry>
-        <entry>
-          <key>${jboss.common.lib.url}</key>
-          <value><inject bean="VfsNamesExceptionHandler"/></value>
-        </entry>
-        <entry>
-          <key>${jboss.server.lib.url}</key>
-          <value><inject bean="VfsNamesExceptionHandler"/></value>
-        </entry>
-        <entry>
-          <key>${jboss.server.home.url}deploy</key>
-          <value><inject bean="VfsNamesExceptionHandler"/></value>
-        </entry>
-      </map>
-    </property>
-    <property name="realCache">
-      <bean class="org.jboss.virtual.plugins.cache.IterableTimedVFSCache"/>
-    </property>
-  </bean>
-
-  <bean name="VfsNamesExceptionHandler" class="org.jboss.virtual.plugins.context.helpers.NamesExceptionHandler">
-    <constructor>
-      <parameter class="java.lang.String">sqljdbc.jar</parameter>
-    </constructor>
-  </bean>
-
-</deployment>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/bootstrap-minimal.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/bootstrap-minimal.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap-minimal.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   The list of URLs for mc beans to load during bootstrap.
-   $Id$
--->
-<bootstrap xmlns="urn:jboss:bootstrap:1.0">
-
-   <url>bootstrap/classloader.xml</url>
-   <url>bootstrap/aop.xml</url>
-   <url>bootstrap/jmx.xml</url>
-   <url>bootstrap/deployers.xml</url>
-   <url>bootstrap/profile.xml</url>
-
-</bootstrap>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/bootstrap.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/bootstrap.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   The list of URLs for mc beans to load during bootstrap.
-   $Id$
--->
-<bootstrap xmlns="urn:jboss:bootstrap:1.0">
-
-   <url>bootstrap/logging.xml</url>
-   <url>bootstrap/vfs.xml</url>
-   <url>bootstrap/classloader.xml</url>
-   <url>bootstrap/aop.xml</url>
-   <url>bootstrap/jmx.xml</url>
-   <url>bootstrap/deployers.xml</url>
-   <url>bootstrap/bindings.xml</url>
-   <url>bootstrap/profile.xml</url>
-
-</bootstrap>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/java.policy
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/java.policy	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/java.policy	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,4 +0,0 @@
-grant {
-        // Allow everything for now
-        permission java.security.AllPermission;
-};

Deleted: branches/Branch_5_x/server/src/etc/conf/default/jax-ws-catalog.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/jax-ws-catalog.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/jax-ws-catalog.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,85 +0,0 @@
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  
-  <system systemId="http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" uri="../../../docs/schema/application_1_4.xsd"/>
-  <system systemId="http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" uri="../../../docs/schema/application-client_1_4.xsd"/>
-  <system systemId="http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd" uri="../../../docs/schema/connector_1_5.xsd"/>
-  <system systemId="http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" uri="../../../docs/schema/ejb-jar_2_1.xsd"/>
-  <system systemId="http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd" uri="../../../docs/schema/j2ee_1_4.xsd"/>
-  <system systemId="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" uri="../../../docs/schema/web-app_2_4.xsd"/>
-  <system systemId="http://schemas.xmlsoap.org/soap/encoding/" uri="../../../docs/schema/soap-encoding_1_1.xsd"/>
-  <system systemId="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd" uri="../../../docs/schema/j2ee_web_services_client_1_1.xsd"/>
-  <system systemId="http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" uri="../../../docs/schema/j2ee_web_services_1_1.xsd"/>
-  <system systemId="http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd" uri="../../../docs/schema/j2ee_jaxrpc_mapping_1_1.xsd"/>
-  <system systemId="http://www.w3.org/2001/xml.xsd" uri="../../../docs/schema/xml.xsd"/>
-  <system systemId="http://www.w3.org/2005/05/xmlmime" uri="../../../docs/schema/xml-media-types.xsd"/>
-  
-  <!--  ejb related -->
-  <public publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN" uri="../../../docs/dtd/ejb-jar.dtd"/>
-  <public publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" uri="../../../docs/dtd/ejb-jar_2_0.dtd"/>
-  <!--  ear stuff -->
-  <public publicId="-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN" uri="../../../docs/dtd/application_1_2.dtd"/>
-  <public publicId="-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" uri="../../../docs/dtd/application_1_3.dtd"/>
-  <public publicId="-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN" uri="../../../docs/dtd/application-client_1_3.dtd"/>
-  <!--  connector descriptors -->
-  <public publicId="-//Sun Microsystems, Inc.//DTD Connector 1.0//EN" uri="../../../docs/dtd/connector_1_0.dtd"/>
-  <!--  war meta-data -->
-  <public publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" uri="../../../docs/dtd/web-app_2_2.dtd"/>
-  <public publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" uri="../../../docs/dtd/web-app_2_3.dtd"/>
-  <!--  jboss-specific -->
-  <public publicId="-//JBoss//DTD J2EE Application 1.3//EN" uri="../../../docs/dtd/jboss-app_3_0.dtd"/>
-  <public publicId="-//JBoss//DTD J2EE Application 1.3V2//EN" uri="../../../docs/dtd/jboss-app_3_2.dtd"/>
-  <public publicId="-//JBoss//DTD J2EE Application 1.4//EN" uri="../../../docs/dtd/jboss-app_4_0.dtd"/>
-  <public publicId="-//JBoss//DTD JAWS//EN" uri="../../../docs/dtd/jaws.dtd"/>
-  <public publicId="-//JBoss//DTD JAWS 2.4//EN" uri="../../../docs/dtd/jaws_2_4.dtd"/>
-  <public publicId="-//JBoss//DTD JAWS 3.0//EN" uri="../../../docs/dtd/jaws_3_0.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSS//EN" uri="../../../docs/dtd/jboss.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSS 2.4//EN" uri="../../../docs/dtd/jboss_2_4.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSS 3.0//EN" uri="../../../docs/dtd/jboss_3_0.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSS 3.2//EN" uri="../../../docs/dtd/jboss_3_2.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSS 4.0//EN" uri="../../../docs/dtd/jboss_4_0.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSS 5.0//EN" uri="../../../docs/dtd/jboss_5_0.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSSCMP-JDBC 3.0//EN" uri="../../../docs/dtd/jbosscmp-jdbc_3_0.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN" uri="../../../docs/dtd/jbosscmp-jdbc_3_2.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSSCMP-JDBC 4.0//EN" uri="../../../docs/dtd/jbosscmp-jdbc_4_0.dtd"/>
-  <public publicId="-//JBoss//DTD Web Application 2.2//EN" uri="../../../docs/dtd/jboss-web.dtd"/>
-  <public publicId="-//JBoss//DTD Web Application 2.3//EN" uri="../../../docs/dtd/jboss-web_3_0.dtd"/>
-  <public publicId="-//JBoss//DTD Web Application 2.3V2//EN" uri="../../../docs/dtd/jboss-web_3_2.dtd"/>
-  <public publicId="-//JBoss//DTD Web Application 2.4//EN" uri="../../../docs/dtd/jboss-web_4_0.dtd"/>
-  <public publicId="-//JBoss//DTD Web Application 5.0//EN" uri="../../../docs/dtd/jboss-web_5_0.dtd"/>
-  <public publicId="-//JBoss//DTD Application Client 3.2//EN" uri="../../../docs/dtd/jboss-client_3_2.dtd"/>
-  <public publicId="-//JBoss//DTD Application Client 4.0//EN" uri="../../../docs/dtd/jboss-client_4_0.dtd"/>
-  <public publicId="-//JBoss//DTD Application Client 5.0//EN" uri="../../../docs/dtd/jboss-client_5_0.dtd"/>
-  <public publicId="-//JBoss//DTD MBean Service 3.2//EN" uri="../../../docs/dtd/jboss-service_3_2.dtd"/>
-  <public publicId="-//JBoss//DTD MBean Service 4.0//EN" uri="../../../docs/dtd/jboss-service_4_0.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSS XMBEAN 1.0//EN" uri="../../../docs/dtd/jboss_xmbean_1_0.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSS XMBEAN 1.1//EN" uri="../../../docs/dtd/jboss_xmbean_1_1.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSS XMBEAN 1.2//EN" uri="../../../docs/dtd/jboss_xmbean_1_2.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSS Security Config 3.0//EN" uri="../../../docs/dtd/security_config.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSS JCA Config 1.0//EN" uri="../../../docs/dtd/jboss-ds_1_0.dtd"/>
-  <public publicId="-//JBoss//DTD JBOSS JCA Config 1.5//EN" uri="../../../docs/dtd/jboss-ds_1_5.dtd"/>
-  <system systemId="http://www.jboss.org/j2ee/schema/security-config_4_0.xsd" uri="../../../docs/schema/security-config_4_0.xsd"/>
-  <system systemId="urn:jboss:aop-deployer" uri="../../../docs/schema/aop-deployer_1_1.xsd"/>
-  <system systemId="urn:jboss:aop-beans:1.0" uri="../../../docs/schema/aop-beans_1_0.xsd"/>
-  <system systemId="urn:jboss:bean-deployer" uri="../../../docs/schema/bean-deployer_1_0.xsd"/>
-  <system systemId="urn:jboss:bean-deployer:2.0" uri="../../../docs/schema/bean-deployer_2_0.xsd"/>
-  <system systemId="urn:jboss:javabean:1.0" uri="../../../docs/schema/javabean_1_0.xsd"/>
-  <system systemId="urn:jboss:security-config:4.1" uri="../../../docs/schema/security-config_4_1.xsd"/>
-  <system systemId="urn:jboss:security-config:5.0" uri="../../../docs/schema/security-config_5_0.xsd"/>
-  <system systemId="urn:jboss:jndi-binding-service:1.0" uri="../../../docs/schema/jndi-binding-service_1_0.xsd"/>
-  <system systemId="urn:jboss:jbossws-config:5.0" uri="../../../docs/schema/jbossws-config_1_0.xsd"/>
-  <system systemId="urn:jboss:user-roles:1.0" uri="../../../docs/schema/user-roles_1_0.xsd"/>
-  <!-- xml -->
-  <public publicId="-//W3C//DTD/XMLSCHEMA 200102//EN" uri="../../../docs/dtd/XMLSchema.dtd"/>
-  <system systemId="http://www.w3.org/2001/XMLSchema.dtd" uri="../../../docs/dtd/XMLSchema.dtd"/>
-  <!-- // This dtd doesn't have a publicId - see XMLSchema.dtd -->
-  <system systemId="datatypes" uri="../../../docs/dtd/datatypes.dtd"/>
-  <system systemId="http://www.w3.org/XML/1998/namespace" uri="../../../docs/schema/xml.xsd"/>
-  
-  <!-- ejb3 + jee5 related-->
-  <system systemId="http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" uri="../../../docs/schema/ejb-jar_3_0.xsd"/>
-  <system systemId="http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_2.xsd" uri="../../../docs/schema/javaee_web_services_client_1_2.xsd"/>
-  <system systemId="http://java.sun.com/xml/ns/javaee/javaee_5.xsd" uri="../../../docs/schema/javaee_5.xsd"/>
-  <system systemId="http://www.jboss.org/j2ee/schema/jboss_5_0.xsd" uri="../../../docs/schema/jboss_5_0.xsd"/>
-  <system systemId="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" uri="../../../docs/schema/web-app_2_5.xsd"/>
-  
-</catalog>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/jboss-log4j.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/jboss-log4j.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/jboss-log4j.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,341 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-   | For more configuration information and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A time/date based rolling appender -->
-   <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="File" value="${jboss.server.log.dir}/server.log"/>
-      <param name="Append" value="true"/>
-      <!-- In AS 5.0.x the server log threshold was set by a system
-           property. In 5.1 and later we are instead using the system
-           property to set the priority on the root logger (see <root/> below)
-      <param name="Threshold" value="${jboss.server.log.threshold}"/>
-      -->
-      
-      <!-- Rollover at midnight each day -->
-      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
-      <!-- Rollover at the top of each hour
-      <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
-      -->
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] (Thread) Message\n -->
-         <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
-
-         <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
-         <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-          -->
-      </layout>
-   </appender>
-
-   <!-- A size based file rolling appender
-   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="${jboss.server.log.dir}/server.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="1"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-     </layout>	    
-   </appender>
-   -->
-
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Message\n -->
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-      </layout>
-   </appender>
-
-   <!-- ====================== -->
-   <!-- More Appender examples -->
-   <!-- ====================== -->
-
-   <!-- Buffer events and log them asynchronously
-   <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <appender-ref ref="FILE"/>
-     <appender-ref ref="CONSOLE"/>
-     <appender-ref ref="SMTP"/>
-   </appender>
-   -->
-
-   <!-- EMail events to an administrator
-   <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="Threshold" value="ERROR"/>
-     <param name="To" value="admin at myhost.domain.com"/>
-     <param name="From" value="nobody at myhost.domain.com"/>
-     <param name="Subject" value="JBoss Sever Errors"/>
-     <param name="SMTPHost" value="localhost"/>
-     <param name="BufferSize" value="10"/>
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
-     </layout>
-   </appender>
-   -->
-
-   <!-- Syslog events
-   <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="Facility" value="LOCAL7"/>
-     <param name="FacilityPrinting" value="true"/>
-     <param name="SyslogHost" value="localhost"/>
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
-     </layout>
-   </appender>
-   -->
-
-   <!-- Log events to JMS (requires a topic to be created)
-   <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="Threshold" value="ERROR"/>
-     <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
-     <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
-   </appender>
-   -->
-
-   <!-- Log events through SNMP
-   <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
-     <param name="ManagementHost" value="127.0.0.1"/>
-     <param name="ManagementHostTrapListenPort" value="162"/>
-     <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
-     <param name="LocalIPAddress" value="127.0.0.1"/>
-     <param name="LocalTrapSendPort" value="161"/>
-     <param name="GenericTrapType" value="6"/>
-     <param name="SpecificTrapType" value="12345678"/>
-     <param name="CommunityString" value="public"/>
-     <param name="ForwardStackTraceWithTrap" value="true"/>
-     <param name="Threshold" value="DEBUG"/>
-     <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
-     <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
-     </layout>
-   </appender>
-   -->
-
-   <!--  Emit events as JMX notifications
-   <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      
-      <param name="Threshold" value="WARN"/>
-      <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
-      
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
-      </layout>
-   </appender>
-   -->
-
-   <!-- Security AUDIT Appender
-   <appender name="AUDIT" class="org.jboss.logging.appender.DailyRollingFileAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="File" value="${jboss.server.log.dir}/audit.log"/>
-      <param name="Append" value="true"/>
-      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="%d %-5p [%c] (%t:%x) %m%n"/>
-      </layout>
-   </appender>
-   -->
-   
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
-   <category name="org.apache">
-      <priority value="INFO"/>
-   </category>
-   
-   <!-- Limit the jacorb category to WARN as its INFO is verbose -->
-   <category name="jacorb">
-      <priority value="WARN"/>
-   </category>
-   
-   <!-- Set the logging level of the JSF implementation that uses
-      | java.util.logging. The jdk logging levels can be controlled
-      | through the org.jboss.logging.log4j.JDKLevel class that
-      | in addition to the standard log4j levels it adds support for
-      | SEVERE, WARNING, CONFIG, FINE, FINER, FINEST
-   -->
-   <category name="javax.enterprise.resource.webcontainer.jsf">
-     <priority value="INFO" class="org.jboss.logging.log4j.JDKLevel"/>
-   </category>
-   
-   <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
-   <category name="org.jgroups">
-      <priority value="WARN"/>
-   </category>
-   
-   <!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
-   <category name="org.quartz">
-      <priority value="INFO"/>
-   </category>
-   
-   <!-- Limit JBoss categories
-   <category name="org.jboss">
-      <priority value="INFO"/>
-   </category>
-   -->
-
-   <!-- Limit the JSR77 categories -->
-   <category name="org.jboss.management">
-      <priority value="INFO"/>
-   </category>
-
-   <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
-   <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
-     <priority value="TRACE"/>
-   </category>
-   -->
-
-   <!-- Category specifically for Security Audit Provider 
-   <category name="org.jboss.security.audit.providers.LogAuditProvider" additivity="false">
-     <priority value="TRACE"/>
-     <appender-ref ref="AUDIT"/>
-   </category>
-   -->
-   
-   <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
-   <category name="org.jboss.serial">
-      <priority value="INFO"/>
-   </category>
-  
-   <!-- Decrease the priority threshold for the org.jboss.varia category
-   <category name="org.jboss.varia">
-     <priority value="DEBUG"/>
-   </category>
-   -->
-   
-   <!-- Enable JBossWS message tracing
-   <category name="org.jboss.ws.core.MessageTrace">
-     <priority value="TRACE"/>
-   </category>
-   -->
-   
-   <!--
-      | An example of enabling the custom TRACE level priority that is used
-      | by the JBoss internals to diagnose low level details. This example
-      | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
-      | subpackages. This will produce A LOT of logging output.
-      |
-      | Note: since jboss AS 4.2.x, the trace level is supported natively by
-      | log4j, so although the custom org.jboss.logging.XLevel priority will
-      | still work, there is no need to use it. The two examples that follow
-      | will both enable trace logging.
-   <category name="org.jboss.system">
-     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
-   </category>
-   <category name="org.jboss.ejb.plugins">
-     <priority value="TRACE"/>
-   </category>
-   -->
-  
-   <!--
-       | Logs these events to SNMP:
-           - server starts/stops
-           - cluster evolution (node death/startup)
-           - When an EJB archive is deployed (and associated verified messages)
-           - When an EAR archive is deployed
-      	 
-   <category name="org.jboss.system.server.Server">
-     <priority value="INFO" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-  
-   <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
-     <priority value="INFO" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-
-   <category name="org.jboss.deployment.MainDeployer">
-     <priority value="ERROR" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-   
-   <category name="org.jboss.ejb.EJBDeployer">
-     <priority value="INFO" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-   
-   <category name="org.jboss.deployment.EARDeployer">
-     <priority value="INFO" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-   -->
-
-   <!-- Clustering logging -->
-   <!-- Uncomment the following to redirect the org.jgroups and
-      org.jboss.ha categories to a cluster.log file.
-
-   <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="1"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-     </layout>
-   </appender>
-   <category name="org.jgroups">
-     <priority value="DEBUG" />
-     <appender-ref ref="CLUSTER"/>
-   </category>
-   <category name="org.jboss.ha">
-     <priority value="DEBUG" />
-     <appender-ref ref="CLUSTER"/>
-   </category>
-   -->
-   
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <!-- 
-         Set the root logger priority via a system property. Note this is parsed by log4j,
-         so the full JBoss system property format is not supported; e.g.
-         setting a default via ${jboss.server.log.threshold:WARN} will not work.         
-       -->
-      <priority value="${jboss.server.log.threshold}"/>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/jboss-minimal.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/jboss-minimal.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/jboss-minimal.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id$ -->
-
-<!-- ===================================================================== -->
-<!--  A minimal 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="${jboss.server.lib.url}" archives="*"/>
-
-   <!-- ==================================================================== -->
-   <!-- 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:jboss-log4j.xml</attribute>      
-      <!-- The value to assign to system property jboss.server.log.threshold
-           if it is not already set. This system property in turn controls
-           the logging threshold for the server.log file.
-           If the system property is already set when this service is created,
-           this value is ignored. -->
-      <attribute name="DefaultJBossServerLogThreshold">INFO</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>
-
-   <!-- ==================================================================== -->
-   <!-- JNDI                                                                 -->
-   <!-- ==================================================================== -->
-
-   <!-- A simple mbean wrapper around the jndi Naming object. This
-      only handles an in memory instance. The NamingService uses this
-      as the JNDI store and exposes it remotely.
-   -->
-   <mbean code="org.jnp.server.NamingBeanImpl"
-      name="jboss:service=NamingBeanImpl"
-      xmbean-dd="resource:xmdesc/NamingBean-xmbean.xml">
-   </mbean>
-   
-   <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>
-      <!-- An example of using the unifed invoker as the transport.
-         <depends optional-attribute-name="InvokerProxyFactory"
-         proxy-type="attribute">jboss:service=proxyFactory,type=unified,target=Naming</depends>
-      -->
-      <depends optional-attribute-name="Naming"
-         proxy-type="attribute">jboss:service=NamingBeanImpl</depends>
-   </mbean>   
-
-</server>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/jboss-service.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/jboss-service.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id$ -->
-
-<!-- ===================================================================== -->
-<!--  JBoss Server Configuration                                           -->
-<!-- ===================================================================== -->
-
-<server>
-
-   <!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and
-        the shared JBOSS_HOME/common/lib directory. This can be restricted to
-        specific jars by specifying them in the archives attribute.
-   -->
-   <classpath codebase="${jboss.server.lib.url}" archives="*"/>
-   <classpath codebase="${jboss.common.lib.url}" archives="*"/>
-
-   <!-- ==================================================================== -->
-   <!-- Main Deployer                                                        -->
-   <!-- ==================================================================== -->
-   <mbean code="org.jboss.deployment.MainDeployer"
-          name="jboss.system:service=MainDeployer">
-   	<!-- This is used to delegate the deployment handling -->
-      <attribute name="KernelMainDeployer"><inject bean="MainDeployer" /></attribute>
-      <!-- This is used to validate incomplete deployments -->
-      <attribute name="Controller"><inject bean="jboss.kernel:service=Kernel" property="controller"/></attribute>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- XMBean Persistence                                                   -->
-   <!-- ==================================================================== -->
-   <mbean code="org.jboss.system.pm.AttributePersistenceService"
-      name="jboss:service=AttributePersistenceService"
-      xmbean-dd="resource:xmdesc/AttributePersistenceService-xmbean.xml">
-      <!-- the AttributePersistenceService is persistent, itself -->
-
-      <!--
-      <attribute name="AttributePersistenceManagerClass">org.jboss.system.pm.XMLAttributePersistenceManager</attribute>
-      <attribute name="AttributePersistenceManagerConfig">
-         <data-directory>data/xmbean-attrs</data-directory>
-      </attribute>
-      <attribute name="ApmDestroyOnServiceStop">false</attribute>
-      <attribute name="VersionTag"></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>
-
-   <!-- ==================================================================== -->
-   <!-- 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:jboss-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>
-      
-      <!-- The value to assign to system property jboss.server.log.threshold
-           if it is not already set. This system property in turn controls
-           the logging threshold for the server.log file.
-           If the system property is already set when this service is created,
-           this value is ignored. -->
-      <attribute name="DefaultJBossServerLogThreshold">INFO</attribute>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- Active Alarm Table                                                   -->
-   <!-- ==================================================================== -->
-
-   <!--
-      | The ActiveAlarmTable service is a simple JMX notification listener
-      | that maintains a table with the received notifications (alarms).
-      | The alarms can be acknowledged through the jmx or the web console.
-      | Modify the SubscriptionList below to subscribe for any notification
-      | in the system and treat it as an alarm.
-      | The JMXNotificationAppender is a log4j Appender that can be configured
-      | in log4j.xml, that trasforms logging events to JMX notification so they
-      | can be fed back into the table. By storing the WARN or higher level logging
-      | events you can have a quick view of important system faults.
-      |
-      | The following attributes may be set:
-      |
-      | MaxTableSize (default 1000)
-      |  - set an upper limit to the number of stored alarms
-      | LogLevel (default DEBUG)
-      |  - the log level to use for received notification, can be set to NONE
-      | ServerId (default jboss)
-      |  - used to construct unique alarm ids
-      | SubscriptionList
-      |  - subscribe for the notifications to be stored in the table
-
-   <mbean code="org.jboss.monitor.services.ActiveAlarmTable"
-          name="jboss.monitor:service=ActiveAlarmTable">
-      <attribute name="SubscriptionList">
-         <subscription-list>
-            <mbean name="jboss.monitor:*">
-               <notification type="jboss.alarm"/>
-               <notification type="JBOSS_MONITOR_NOTIFICATION"/>
-            </mbean>
-            <mbean name="jboss.system:service=Logging,type=JMXNotificationAppender"/>
-         </subscription-list>
-      </attribute>
-   </mbean>
-   -->
-
-   <!-- ==================================================================== -->
-   <!-- JBoss RMI Classloader - only install when available                  -->
-   <!-- ==================================================================== -->
-   <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
-      name="jboss.rmi:type=RMIClassLoader">
-      <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
-      <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- Class Loading                                                        -->
-   <!-- ==================================================================== -->
-
-   <!-- A mini webserver used for dynamic and class and resource loading --> 
-   <mbean code="org.jboss.web.WebService"
-      name="jboss:service=WebService">
-      <!-- The Bind address and Port -->
-      <attribute name="BindAddress">${jboss.bind.address}</attribute>      
-      <attribute name="Port">
-         <!-- Get the port to use from ServiceBindingManager. -->
-         <value-factory bean="ServiceBindingManager" method="getIntBinding" parameter="jboss:service=WebService"/>
-      </attribute>
-      <!--  The address to use for the host portion of the RMI codebase URL -->
-      <attribute name="Host">${java.rmi.server.hostname}</attribute>
-      <!-- Should non-EJB .class files be downloadable -->
-      <attribute name="DownloadServerClasses">true</attribute>
-      <!-- Should resources other than .class files be downloadable. Both
-         DownloadServerClasses and DownloadResources must be true for resources
-         to be downloadable. This is false by default because its generally a
-         bad idea as server configuration files that container security
-         information can be accessed.
-       -->
-      <attribute name="DownloadResources">false</attribute>
-
-      <!-- Use the default thread pool for dynamic class loading -->
-      <depends optional-attribute-name="ThreadPool"
-         proxy-type="attribute">jboss.system:service=ThreadPool</depends>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- JNDI                                                                 -->
-   <!-- ==================================================================== -->
-
-   <!-- A simple mbean wrapper around the jndi Naming object. This
-      only handles an in memory instance. The NamingService uses this
-      as the JNDI store and exposes it remotely.
-   -->
-   <mbean code="org.jnp.server.NamingBeanImpl"
-      name="jboss:service=NamingBeanImpl"
-      xmbean-dd="resource:xmdesc/NamingBean-xmbean.xml">
-   </mbean>
-   
-   <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">
-         <value-factory bean="ServiceBindingManager" method="getIntBinding">
-            <parameter>jboss:service=Naming</parameter>
-            <parameter>Port</parameter>
-         </value-factory>
-      </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">
-         <value-factory bean="ServiceBindingManager" method="getIntBinding">
-            <parameter>jboss:service=Naming</parameter>
-            <parameter>RmiPort</parameter>
-         </value-factory>
-      </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>
-      <!-- An example of using the unifed invoker as the transport.
-         <depends optional-attribute-name="InvokerProxyFactory"
-         proxy-type="attribute">jboss:service=proxyFactory,type=unified,target=Naming</depends>
-      -->
-      <depends optional-attribute-name="Naming"
-         proxy-type="attribute">jboss:service=NamingBeanImpl</depends>
-   </mbean>
-   
-   <mbean code="org.jboss.naming.JNDIView"
-   	name="jboss:service=JNDIView"
-   	xmbean-dd="resource:xmdesc/JNDIView-xmbean.xml">
-   	<!-- The HANamingService service name -->
-   	<attribute name="HANamingService">jboss:service=HAJNDI</attribute>
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- Security                                                             -->
-   <!-- ==================================================================== -->
-
-   <!-- JAAS security manager and realm mapping -->
-   <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
-      name="jboss.security:service=JaasSecurityManager">
-      <!-- A flag which indicates whether the SecurityAssociation server mode
-      is set on service creation. This is true by default since the
-      SecurityAssociation should be thread local for multi-threaded server
-      operation.
-      -->
-      <attribute name="ServerMode">true</attribute>
-      <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">1800</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>
-      <!-- DeepCopySubjectMode: This set the copy mode of subjects done by the
-      security managers to be deep copies that makes copies of the subject
-      principals and credentials if they are cloneable. It should be set to
-      true if subject include mutable content that can be corrupted when
-      multiple threads have the same identity and cache flushes/logout clearing
-      the subject in one thread results in subject references affecting other
-      threads.
-      -->
-      <attribute name="DeepCopySubjectMode">false</attribute>
-   </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"/>
-
-</server>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/login-config.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/login-config.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/login-config.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,132 +0,0 @@
-<?xml version='1.0'?>
-
-<!-- The XML based JAAS login configuration read by the
-org.jboss.security.auth.login.XMLLoginConfig mbean. Add
-an application-policy element for each security domain.
-
-The outline of the application-policy is:
-<application-policy name="security-domain-name">
-  <authentication>
-    <login-module code="login.module1.class.name" flag="control_flag">
-      <module-option name = "option1-name">option1-value</module-option>
-      <module-option name = "option2-name">option2-value</module-option>
-      ...
-    </login-module>
-
-    <login-module code="login.module2.class.name" flag="control_flag">
-      ...
-    </login-module>
-    ...
-  </authentication>
-</application-policy>
-
-$Id$
-$Revision$
--->
-
-<policy>
-  <!-- Used by clients within the application server VM such as
-  mbeans and servlets that access EJBs.
-  -->
-  <application-policy name="client-login">
-    <authentication>
-      <login-module code="org.jboss.security.ClientLoginModule"
-        flag="required">
-         <!-- Any existing security context will be restored on logout -->
-         <module-option name="restore-login-identity">true</module-option>
-      </login-module>
-    </authentication>
-  </application-policy>
-
-  <!-- Security domains for testing new jca framework -->
-  <application-policy name="HsqlDbRealm">
-    <authentication>
-      <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
-        flag="required">
-        <module-option name="principal">sa</module-option>
-        <module-option name="userName">sa</module-option>
-        <module-option name="password"></module-option>
-        <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
-      </login-module>
-    </authentication>
-  </application-policy>
-
-  <application-policy name="JmsXARealm">
-    <authentication>
-      <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
-        flag="required">
-        <module-option name="principal">guest</module-option>
-        <module-option name="userName">guest</module-option>
-        <module-option name="password">guest</module-option>
-        <module-option name="managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
-      </login-module>
-    </authentication>
-  </application-policy>
-
-  <!-- A template configuration for the jmx-console web application. This
-    defaults to the UsersRolesLoginModule the same as other and should be
-    changed to a stronger authentication mechanism as required.
-  -->
-  <application-policy name="jmx-console">
-    <authentication>
-      <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-        flag="required">
-        <module-option name="usersProperties">props/jmx-console-users.properties</module-option>
-        <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option>
-      </login-module>
-    </authentication>
-  </application-policy>
-
-  <!-- A template configuration for the web-console web application. This
-    defaults to the UsersRolesLoginModule the same as other and should be
-    changed to a stronger authentication mechanism as required.
-  -->
-  <application-policy name="web-console">
-    <authentication>
-      <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-        flag="required">
-        <module-option name="usersProperties">web-console-users.properties</module-option>
-        <module-option name="rolesProperties">web-console-roles.properties</module-option>
-      </login-module>
-    </authentication>
-  </application-policy>
-
-  <!--
-    A template configuration for the JBossWS security domain.
-    This defaults to the UsersRolesLoginModule the same as other and should be
-    changed to a stronger authentication mechanism as required.
-  -->
-  <application-policy name="JBossWS">
-    <authentication>
-      <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-        flag="required">
-        <module-option name="usersProperties">props/jbossws-users.properties</module-option>
-        <module-option name="rolesProperties">props/jbossws-roles.properties</module-option>
-        <module-option name="unauthenticatedIdentity">anonymous</module-option>
-      </login-module>
-    </authentication>
-  </application-policy>
-
-  <!-- The default login configuration used by any security domain that
-  does not have a application-policy entry with a matching name
-  -->
-  <application-policy name="other">
-    <!-- A simple server login module, which can be used when the number
-    of users is relatively small. It uses two properties files:
-    users.properties, which holds users (key) and their password (value).
-    roles.properties, which holds users (key) and a comma-separated list of
-    their roles (value).
-    The unauthenticatedIdentity property defines the name of the principal
-    that will be used when a null username and password are presented as is
-    the case for an unuathenticated web client or MDB. If you want to
-    allow such users to be authenticated add the property, e.g.,
-    unauthenticatedIdentity="nobody"
-    -->
-    <authentication>
-      <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-        flag="required"/>
-    </authentication>
-  </application-policy>
-
-</policy>
-

Deleted: branches/Branch_5_x/server/src/etc/conf/default/standardjboss.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/standardjboss.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/standardjboss.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,1111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC
-      "-//JBoss//DTD JBOSS 5.0//EN"
-      "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
-
-<!-- ===================================================================== -->
-<!--  Standard JBoss EJB Configurations                                    -->
-<!-- ===================================================================== -->
-<!-- $Id$ -->
-
-<jboss>
-  <!--
-   The missing-method-permissions-excluded-mode is a boolean
-   that allows the deployer to globally indicate that all methods without a
-   method-permission element should be treated as excluded(= true and the default),
-   or that methods without a method-permission element should be treated as
-   unchecked(= false)
-  -->
-  <missing-method-permissions-excluded-mode>true</missing-method-permissions-excluded-mode>
-  <!-- The default principal name for callers without credentials
-  -->
-  <unauthenticated-principal>anonymous</unauthenticated-principal>
-
-  <invoker-proxy-bindings>
-
-    <invoker-proxy-binding>
-      <name>entity-unified-invoker</name>
-      <invoker-mbean>jboss:service=invoker,type=unified</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.ejb.SecurityContextInterceptor</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.ejb.SecurityContextInterceptor</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.ejb.SecurityContextInterceptor</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-unified-invoker</name>
-      <invoker-mbean>jboss:service=invoker,type=unifiedha</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.ejb.SecurityContextInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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.ejb.SecurityContextInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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.ejb.SecurityContextInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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-unified-invoker</name>
-      <invoker-mbean>jboss:service=invoker,type=unified</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.ejb.SecurityContextInterceptor</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.ejb.SecurityContextInterceptor</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-unified-invoker</name>
-      <invoker-mbean>jboss:service=invoker,type=unifiedha</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.ejb.SecurityContextInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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.ejb.SecurityContextInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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-unified-invoker</name>
-      <invoker-mbean>jboss:service=invoker,type=unified</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.ejb.SecurityContextInterceptor</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.ejb.SecurityContextInterceptor</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-unified-invoker</name>
-      <invoker-mbean>jboss:service=invoker,type=unifiedha</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.ejb.SecurityContextInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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.ejb.SecurityContextInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
-            <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</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>false</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>false</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>
-        <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>
-        <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>
-      </proxy-factory-config>
-    </invoker-proxy-binding>
-  </invoker-proxy-bindings>
-
-  <container-configurations>
-
-    <container-configuration>
-      <container-name>Standard Pessimistic CMP 2.x EntityBean</container-name>
-      <call-logging>false</call-logging>
-      <invoker-proxy-binding-name>entity-unified-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.security.PreSecurityInterceptor</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-unified-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.security.PreSecurityInterceptor</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>
-            <!-- uncomment to enable time-based eviction
-            <overager-period>300</overager-period>
-            <max-bean-age>600</max-bean-age> -->
-         </cache-policy-conf>
-         <cache-policy-conf-other>
-            <partitions>10</partitions>
-            <!-- uncomment to use JDBC java.sql.Statement.executeBatch()
-            <batch-commit-strategy/> -->
-            <!-- uncomment to enable cache invalidation <invalidable/> -->
-         </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-unified-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.security.PreSecurityInterceptor</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>
-         <home-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</home-load-balance-policy>
-         <bean-load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailable</bean-load-balance-policy>
-      </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-unified-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.security.PreSecurityInterceptor</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-unified-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.security.PreSecurityInterceptor</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 extends="Instance Per Transaction CMP 2.x EntityBean">
-      <container-name>Standard CMP 2.x EntityBean</container-name>
-    </container-configuration>
-
-    <container-configuration>
-      <container-name>Standard Pessimistic CMP EntityBean</container-name>
-      <call-logging>false</call-logging>
-      <invoker-proxy-binding-name>entity-unified-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.security.PreSecurityInterceptor</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-unified-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.security.PreSecurityInterceptor</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>
-         <home-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</home-load-balance-policy>
-         <bean-load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailable</bean-load-balance-policy>
-      </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-unified-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.security.PreSecurityInterceptor</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 extends="Instance Per Transaction CMP EntityBean">
-      <container-name>Standard CMP EntityBean</container-name>
-    </container-configuration>
-
-    <container-configuration>
-      <container-name>Standard Stateless SessionBean</container-name>
-      <call-logging>false</call-logging>
-      <invoker-proxy-binding-name>stateless-unified-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.security.PreSecurityInterceptor</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.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>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-unified-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.security.PreSecurityInterceptor</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.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>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>
-         <home-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</home-load-balance-policy>
-         <bean-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</bean-load-balance-policy>
-      </cluster-config>
-    </container-configuration>
-
-
-    <container-configuration>
-      <container-name>Standard Stateful SessionBean</container-name>
-      <call-logging>false</call-logging>
-      <invoker-proxy-binding-name>stateful-unified-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.security.PreSecurityInterceptor</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>
-        <interceptor>org.jboss.ejb.plugins.StatefulSessionSecurityInterceptor</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-unified-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.security.PreSecurityInterceptor</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.ejb.plugins.StatefulSessionSecurityInterceptor</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>
-         <home-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</home-load-balance-policy>
-         <bean-load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailable</bean-load-balance-policy>
-         <session-state-manager-jndi-name>/HASessionState/Default</session-state-manager-jndi-name>
-      </cluster-config>
-    </container-configuration>
-
-    <container-configuration>
-      <container-name>Standard Pessimistic BMP EntityBean</container-name>
-      <call-logging>false</call-logging>
-      <invoker-proxy-binding-name>entity-unified-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.security.PreSecurityInterceptor</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-unified-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.security.PreSecurityInterceptor</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>
-         <home-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</home-load-balance-policy>
-         <bean-load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailable</bean-load-balance-policy>
-      </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-unified-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.security.PreSecurityInterceptor</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 extends="Instance Per Transaction BMP EntityBean">
-      <container-name>Standard BMP EntityBean</container-name>
-    </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>

Deleted: branches/Branch_5_x/server/src/etc/conf/default/standardjbosscmp-jdbc.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/standardjbosscmp-jdbc.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/server/src/etc/conf/default/standardjbosscmp-jdbc.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,3100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jbosscmp-jdbc PUBLIC
-   "-//JBoss//DTD JBOSSCMP-JDBC 4.0//EN"
-   "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_4_0.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Standard JBossCMP-JDBC Configuration                                 -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<jbosscmp-jdbc>
-
-   <defaults>
-      <datasource>java:/DefaultDS</datasource>
-      <!-- optional since 4.0 <datasource-mapping>@default.type.mapping@</datasource-mapping> -->
-
-      <create-table>true</create-table>
-      <remove-table>false</remove-table>
-      <read-only>false</read-only>
-      <read-time-out>300000</read-time-out>
-      <row-locking>false</row-locking>
-      <pk-constraint>true</pk-constraint>
-      <fk-constraint>false</fk-constraint>
-      <preferred-relation-mapping>foreign-key</preferred-relation-mapping>
-      <read-ahead>
-         <strategy>on-load</strategy>
-         <page-size>1000</page-size>
-         <eager-load-group>*</eager-load-group>
-      </read-ahead>
-      <list-cache-max>1000</list-cache-max>
-      <clean-read-ahead-on-load>false</clean-read-ahead-on-load>
-
-      <unknown-pk>
-         <key-generator-factory>UUIDKeyGeneratorFactory</key-generator-factory>
-         <unknown-pk-class>java.lang.String</unknown-pk-class>
-         <jdbc-type>VARCHAR</jdbc-type>
-         <sql-type>VARCHAR(32)</sql-type>
-      </unknown-pk>
-
-      <entity-command name="default"/>
-      <ql-compiler>org.jboss.ejb.plugins.cmp.jdbc.JDBCEJBQLCompiler</ql-compiler>
-      <throw-runtime-exceptions>false</throw-runtime-exceptions>
-   </defaults>
-
-   <type-mappings>
-      <type-mapping>
-         <name>FirstSQL/J</name>
-         <row-locking-template/>
-         <pk-constraint-template>PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>(?1 || ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substring</function-name>
-            <function-sql>substring(?1 FROM ?2 FOR ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>char_length(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>position(?1 IN ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>math.abs(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>math.sqrt(CAST(?1 AS DOUBLE))</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>TINYINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>TINYINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>BIGINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>REAL</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <!-- or <sql-type>VARCHAR(2147483500)</sql-type> -->
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>DECIMAL</jdbc-type>
-            <sql-type>DECIMAL</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <!-- FirstSQL/J only supports directly serializable objects for classes declared with CREATE CLASS -->
-            <jdbc-type>LONGVARBINARY</jdbc-type>
-            <sql-type>VARCHAR(2147483500)</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>Ingres</name>
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 PRIMARY KEY (?3)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>TRUE</true-mapping>
-         <false-mapping>FALSE</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>concat(?1,?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substring</function-name>
-            <function-sql>left(?1,?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>length(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>locate(?1,?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>abs(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>sqrt(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <!-- change from bit to integer , 10.12.2002 heb -->
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>INT1</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>INTEGER4</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>FLOAT</jdbc-type>
-            <sql-type>FLOAT4</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>FLOAT8</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>FLOAT8</sql-type>
-         </mapping>
-<!--
-Mapping proposed by Computer Associates, but does not work with JBoss properly
-28.03.2003 hou
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>NUMERIC</jdbc-type>
-            <sql-type>DECIMAL(24,6)</sql-type>
-         </mapping>
--->
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>JAVA_OBJECT</jdbc-type>
-            <sql-type>LONG VARCHAR</sql-type>
-         </mapping>
-      </type-mapping>
-     <type-mapping>
-      <name>McKoi</name>
-      <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-      <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-      <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-      <alias-header-prefix>t</alias-header-prefix>
-      <alias-header-suffix>_</alias-header-suffix>
-      <alias-max-length>32</alias-max-length>
-      <subquery-supported>true</subquery-supported>
-      <true-mapping>TRUE</true-mapping>
-      <false-mapping>FALSE</false-mapping>
-
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-      <mapping>
-         <java-type>java.lang.Boolean</java-type>
-         <jdbc-type>BIT</jdbc-type>
-         <sql-type>BOOLEAN</sql-type>
-      </mapping>
-      <mapping>
-         <java-type>java.lang.Byte</java-type>
-         <jdbc-type>TINYINT</jdbc-type>
-         <sql-type>SMALLINT</sql-type>
-      </mapping>
-      <mapping>
-         <java-type>java.lang.Short</java-type>
-         <jdbc-type>SMALLINT</jdbc-type>
-         <sql-type>SMALLINT</sql-type>
-      </mapping>
-      <mapping>
-         <java-type>java.lang.Integer</java-type>
-         <jdbc-type>INTEGER</jdbc-type>
-         <sql-type>INTEGER</sql-type>
-      </mapping>
-      <mapping>
-         <java-type>java.lang.Long</java-type>
-         <jdbc-type>BIGINT</jdbc-type>
-         <sql-type>BIGINT</sql-type>
-      </mapping>
-      <mapping>
-         <java-type>java.lang.Float</java-type>
-         <jdbc-type>REAL</jdbc-type>
-         <sql-type>FLOAT</sql-type>
-      </mapping>
-      <mapping>
-         <java-type>java.lang.Double</java-type>
-         <jdbc-type>DOUBLE</jdbc-type>
-         <sql-type>DOUBLE</sql-type>
-      </mapping>
-      <mapping>
-         <java-type>java.lang.Character</java-type>
-         <jdbc-type>CHAR</jdbc-type>
-         <sql-type>CHAR</sql-type>
-      </mapping>
-      <mapping>
-         <java-type>java.lang.String</java-type>
-         <jdbc-type>VARCHAR</jdbc-type>
-         <sql-type>VARCHAR(64)</sql-type>
-      </mapping>
-      <mapping>
-         <java-type>java.sql.Date</java-type>
-         <jdbc-type>DATE</jdbc-type>
-         <sql-type>DATE</sql-type>
-      </mapping>
-      <mapping>
-         <java-type>java.sql.Time</java-type>
-         <jdbc-type>TIME</jdbc-type>
-         <sql-type>TIME</sql-type>
-      </mapping>
-      <mapping>
-         <java-type>java.sql.Timestamp</java-type>
-         <jdbc-type>TIMESTAMP</jdbc-type>
-         <sql-type>TIMESTAMP</sql-type>
-      </mapping>
-      <mapping>
-         <java-type>java.lang.Object</java-type>
-         <jdbc-type>JAVA_OBJECT</jdbc-type>
-         <sql-type>JAVA_OBJECT</sql-type>
-      </mapping>
-     </type-mapping>
-
-      <type-mapping>
-         <name>Firebird</name>
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>31</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>SMALLINT default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>SMALLINT default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>NUMERIC(18,0) default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>FLOAT default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE PRECISION default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <!-- The small default length is due to the 128 byte max index key size -->
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(64)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>JAVA_OBJECT</jdbc-type>
-            <sql-type>BLOB</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>InterBase</name>
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>31</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>SMALLINT default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>SMALLINT default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>NUMERIC(18,0) default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>FLOAT default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE PRECISION default 0</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(64)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>JAVA_OBJECT</jdbc-type>
-            <sql-type>VARCHAR(2000)</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>DB2</name>
-         <row-locking-template/>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>18</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-		 <function-mapping>
-			 <function-name>locate</function-name>
-			 <function-sql>locate(CAST(?1 as VARCHAR(254)),
-				 CAST(?2 as VaRCHAR(254)),?3)</function-sql>
-		 </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-    <!--  DB2 does not appear to support columns of type "byte"
-    Regrettably, this means they'll be serialized.
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR(1) FOR BIT DATA</sql-type>
-         </mapping>
-    -->
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>BIGINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>REAL</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(254)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <!-- this one gives errors with DB2 V8.1
-         		and at least the NET driver
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>JAVA_OBJECT</jdbc-type>
-            <sql-type>BLOB(2000)</sql-type>
-         </mapping>
-         -->
-      	<mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>VARBINARY</jdbc-type>
-            <sql-type>BLOB(2000)</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>Derby</name>
-         <row-locking-template/>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>18</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>(?1 || ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substr</function-name>
-            <function-sql>substr(?1, ?2, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>length(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>locate(?2, ?1, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>abs(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>sqrt(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>NUMERIC</jdbc-type>
-            <sql-type>DECIMAL</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>BOOLEAN</sql-type>
-         </mapping>
-<!-- if someone knows the mapping for byte, please, let us know!
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
--->
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>BIGINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>REAL</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE PRECISION</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>BLOB</jdbc-type>
-            <sql-type>BLOB</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>Oracle9i</name>
-         <!--
-         | Make sure that you have the Oracle 9i version of classes12.jar
-         | or you will suffer
-         -->
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>30</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>(?1 || ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substring</function-name>
-            <function-sql>substr(?1, ?2, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>length(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>instr(?2, ?1, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>abs(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>sqrt(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>NUMBER(1)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>NUMBER(3)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>NUMERIC</jdbc-type>
-            <!-- <jdbc-type>SMALLINT</jdbc-type> this resulted in a ClassCastException -->
-            <sql-type>NUMBER(5)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>NUMBER(10)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>NUMBER(19)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>NUMBER(38,7)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>DECIMAL</jdbc-type>
-            <sql-type>NUMBER(38,15)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>NUMBER(38,15)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR2(255)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP(3)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP(9)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>BLOB</jdbc-type>
-            <sql-type>BLOB</sql-type>
-            <!--
-            | Change this from BLOB to RAW(n) if you know your
-            | serialized object will be <= n bytes and n <= 2000
-            -->
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>Oracle8</name>
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>30</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>(?1 || ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substring</function-name>
-            <function-sql>substr(?1, ?2, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>length(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>instr(?2, ?1, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>abs(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>sqrt(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>NUMBER(1)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>NUMERIC</jdbc-type>
-            <sql-type>NUMBER(3)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>NUMERIC</jdbc-type>
-            <sql-type>NUMBER(5)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>NUMBER(10)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>NUMBER(19)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>NUMBER(38,7)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>DECIMAL</jdbc-type>
-            <sql-type>NUMBER(38,15)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>NUMBER(38,15)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR2(255)</sql-type>
-         </mapping>
-         <mapping>
-            <!--
-            | Note that you lose granularity here
-            | Use a numeric type and store milliseconds if you really need it
-            -->
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <!--
-            | Note that you lose granularity here
-            | Use a numeric type and store milliseconds if you really need it
-            -->
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>BLOB</jdbc-type>
-            <sql-type>BLOB</sql-type>
-            <!--
-            | Change this from BLOB to RAW(n) if you know your
-            | serialized object will be <= n bytes and n <= 2000
-            -->
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>Oracle7</name>
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>30</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>(?1 || ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substring</function-name>
-            <function-sql>substr(?1, ?2, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>length(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>instr(?2, ?1, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>abs(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>sqrt(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>NUMBER(1)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>NUMERIC</jdbc-type>
-            <sql-type>NUMBER(3)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>NUMERIC</jdbc-type>
-            <sql-type>NUMBER(5)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>NUMBER(10)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>NUMBER(19)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>NUMBER(38,7)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>NUMBER(38,15)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR2(255)</sql-type>
-         </mapping>
-         <mapping>
-            <!--
-            | Note that you lose granularity here
-            | Use a numeric type and store milliseconds if you really need it
-            -->
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <!--
-            | Note that you lose granularity here
-            | Use a numeric type and store milliseconds if you really need it
-            -->
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>LONGVARBINARY</jdbc-type>
-            <sql-type>LONG RAW</sql-type>
-            <!--
-            | Change this from LONG RAW to RAW(n) if you know your
-            | serialized object will be <= n bytes and n <= 2000
-            | Oracle only permits one LONG type per table
-            -->
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>Sybase</name>
-         <row-locking-template/>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>30</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-         	<function-name>length</function-name>
-         	<function-sql>char_length(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>BIT</sql-type>
-         </mapping>
-    <!-- Current Sybase JDBC drivers (jConnect 5.2) don't support
-    byte or short.  Unfortunately they'll be serialized.
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>TINYINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-    -->
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>NUMERIC</jdbc-type>
-            <sql-type>NUMERIC(38,0)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>REAL</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE PRECISION</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(255)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>SMALLDATETIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>JAVA_OBJECT</jdbc-type>
-            <sql-type>IMAGE</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>PostgreSQL</name>
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1</auto-increment-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>TRUE</true-mapping>
-         <false-mapping>FALSE</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>(?1 || ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substring</function-name>
-            <function-sql>substring(?1 FROM ?2 FOR ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>length(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>(CASE position(?1 in substring(?2 from ?3)) WHEN 0 THEN 0 ELSE position(?1 in substring(?2 from ?3)) + ?3 - 1 END)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>abs(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>sqrt(CAST(?1 AS double precision))</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>BOOLEAN</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>INT2</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>INT2</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INT4</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>INT8</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>FLOAT</jdbc-type>
-            <sql-type>FLOAT(7)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>FLOAT8</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR(1)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>TEXT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP with time zone</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP with time zone</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>NUMERIC</jdbc-type>
-            <sql-type>NUMERIC</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>VARBINARY</jdbc-type>
-            <sql-type>BYTEA</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>PostgreSQL 8.0</name>
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1</auto-increment-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>TRUE</true-mapping>
-         <false-mapping>FALSE</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>(?1 || ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substring</function-name>
-            <function-sql>substring(?1 FROM ?2 FOR ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>length(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>(CASE position(?1 in substring(?2 from ?3)) WHEN 0 THEN 0 ELSE position(?1 in substring(?2 from ?3)) + ?3 - 1 END)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>abs(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>sqrt(CAST(?1 AS double precision))</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BOOLEAN</jdbc-type>
-            <sql-type>BOOLEAN</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>INT2</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>INT2</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INT4</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>INT8</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>FLOAT</jdbc-type>
-            <sql-type>FLOAT(7)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>FLOAT8</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR(1)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>TEXT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>NUMERIC</jdbc-type>
-            <sql-type>NUMERIC</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>VARBINARY</jdbc-type>
-            <sql-type>BYTEA</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>PostgreSQL 7.2</name>
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1</auto-increment-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>TRUE</true-mapping>
-         <false-mapping>FALSE</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>(?1 || ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substring</function-name>
-            <function-sql>substring(?1 FROM ?2 FOR ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>length(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>(CASE position(?1 in substring(?2 from ?3)) WHEN 0 THEN 0 ELSE position(?1 in substring(?2 from ?3)) + ?3 - 1 END)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>abs(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>sqrt(CAST(?1 AS double precision))</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>BOOLEAN</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>INT2</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>INT2</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INT4</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>INT8</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>FLOAT</jdbc-type>
-            <sql-type>FLOAT(7)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>FLOAT8</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR(1)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>TEXT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>NUMERIC</jdbc-type>
-            <sql-type>NUMERIC</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>VARBINARY</jdbc-type>
-            <sql-type>BYTEA</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>Hypersonic SQL</name>
-         <row-locking-template/>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1 IDENTITY</auto-increment-template>
-         <add-column-template>ALTER TABLE ?1 ADD COLUMN ?2 ?3</add-column-template>
-         <drop-column-template>ALTER TABLE ?1 DROP COLUMN ?2</drop-column-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>(1=1)</true-mapping>
-         <false-mapping>(1=0)</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>(?1 || ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substring</function-name>
-            <function-sql>SUBSTRING(?1, ?2, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lcase(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>LENGTH(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>LOCATE(?1, ?2, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>ABS(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>SQRT(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>ucase(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>BIT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <!-- hsqldb only supports directly serializable objects for sql type OBJECT -->
-            <jdbc-type>VARBINARY</jdbc-type>
-            <sql-type>VARBINARY</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>REAL</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>BIGINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>DECIMAL</jdbc-type>
-            <sql-type>DECIMAL</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>PointBase</name>
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>TRUE</true-mapping>
-         <false-mapping>FALSE</false-mapping>
-
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>position(?1 IN ?2)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>FLOAT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>FLOAT</jdbc-type>
-            <sql-type>FLOAT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>BOOLEAN</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>BLOB</jdbc-type>
-            <sql-type>BLOB</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>SOLID</name>
-         <row-locking-template/>
-         <pk-constraint-template>PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>TINYINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>BLOB</jdbc-type>
-            <sql-type>BLOB</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>BIT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>FLOAT</jdbc-type>
-            <sql-type>FLOAT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>BIGINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>mySQL</name>
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <!-- does not work for compound keys <fk-constraint-template>ALTER TABLE ?1 ADD INDEX ind_?3 (?3), ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-              <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         -->
-         <fk-constraint-template>ALTER TABLE ?1 ADD INDEX (?3), ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1 auto_increment</auto-increment-template>
-         <alter-column-template>ALTER TABLE ?1 MODIFY ?2 ?3</alter-column-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>false</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>concat(?1, ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substring</function-name>
-            <function-sql>substring(?1 FROM ?2 FOR ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>length(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>locate(?1, ?2, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>abs(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>sqrt(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>FLOAT</jdbc-type>
-            <sql-type>FLOAT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>TINYINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>BLOB</jdbc-type>
-            <sql-type>LONGBLOB</sql-type>
-            <!--
-            | Change this from LONGBLOB to BLOB if you know your
-            | serialized object will be <= 2^16 bytes
-            -->
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-            <!--
-            | This type is problematical because mysql does not have any
-            | date/time types that store milliseconds. You should avoid it.
-            -->
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>TINYINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>BIGINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(250) BINARY</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-            <!--
-            | Note that you lose granularity here
-            | Use a numeric type and store milliseconds if you really need it
-            -->
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>MS SQLSERVER</name>
-         <row-locking-template>SELECT ?1 FROM ?2 with (updlock) WHERE ?3 ORDER BY ?4</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1 IDENTITY</auto-increment-template>
-         <alter-column-template>ALTER TABLE ?1 ALTER COLUMN ?2 ?3</alter-column-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>(?1 + ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substring</function-name>
-            <function-sql>substring(?1, ?2, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>len(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>charindex(?1, ?2, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>abs(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>sqrt(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>DECIMAL</jdbc-type>
-            <sql-type>DECIMAL(20)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>JAVA_OBJECT</jdbc-type>
-            <sql-type>IMAGE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>TINYINT</sql-type>
-         </mapping>
-         <mapping>
-            <!--
-            | Note that you lose granularity here
-            | Use a numeric type and store milliseconds if you really need it
-            -->
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>BIT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>FLOAT</jdbc-type>
-            <sql-type>FLOAT</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>MS SQLSERVER2000</name>
-         <!--
-         | This type-mapping applies both to MS SQLSERVER 2000 and MS SQLSERVER 2005
-         -->          
-         <row-locking-template>SELECT ?1 FROM ?2 with (xlock) WHERE ?3 ORDER BY ?4</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1 IDENTITY</auto-increment-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>concat</function-name>
-            <function-sql>(?1 + ?2)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>substring</function-name>
-            <function-sql>substring(?1, ?2, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>lcase</function-name>
-            <function-sql>lower(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>length</function-name>
-            <function-sql>len(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>locate</function-name>
-            <function-sql>charindex(?1, ?2, ?3)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>abs</function-name>
-            <function-sql>abs(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>sqrt</function-name>
-            <function-sql>sqrt(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>ucase</function-name>
-            <function-sql>upper(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-         <function-mapping>
-            <function-name>mod</function-name>
-            <function-sql>(?1 % ?2)</function-sql>
-         </function-mapping>
-         
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>BIGINT</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>LONGVARBINARY</jdbc-type>
-            <sql-type>IMAGE</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>TINYINT</sql-type>
-         </mapping>
-
-         <mapping>
-            <!--
-            | Note that you lose granularity here
-            | Use a numeric type and store milliseconds if you really need it
-            -->
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATETIME</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>BIT</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>REAL</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>FLOAT</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>DB2/400</name>
-         <row-locking-template/>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>18</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR(1)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-    <!-- Apparent DB2/400 doesn't handle Byte type either
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR(1) FOR BIT DATA</sql-type>
-         </mapping>
-    -->
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>FLOAT</jdbc-type>
-            <sql-type>FLOAT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR(5)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>JAVA_OBJECT</jdbc-type>
-            <sql-type>VARCHAR(4096) FOR BIT DATA</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>SapDB</name>
-         <!-- SapDB 7.3 might require '... UPDATE OF ?1' in the row-locking-template -->
-         <!-- as is works with SapDB 7.4 -->
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD FOREIGN KEY ?2 (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>JAVA_OBJECT</jdbc-type>
-            <sql-type>LONG BYTE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>CHAR BYTE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>BOOLEAN</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>FLOAT</jdbc-type>
-            <sql-type>FLOAT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE PRECISION</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>DECIMAL</jdbc-type>
-            <sql-type>DECIMAL(20)</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>MaxDB</name>
-         <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD FOREIGN KEY ?2 (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-             <auto-increment-template>?1</auto-increment-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>true</true-mapping>
-         <false-mapping>false</false-mapping>
-
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>JAVA_OBJECT</jdbc-type>
-            <sql-type>LONG BYTE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>CHAR BYTE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BOOLEAN</jdbc-type>
-            <sql-type>BOOLEAN</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>FLOAT</jdbc-type>
-            <sql-type>FLOAT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE PRECISION</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>DECIMAL</jdbc-type>
-            <sql-type>DECIMAL(20)</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-         <name>Cloudscape</name>
-         <row-locking-template/>
-         <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>LONGVARCHAR</jdbc-type>
-            <sql-type>LONG VARCHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>BOOLEAN</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>TINYINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>LONGINT</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>REAL</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE PRECISION</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>LONGVARCHAR</jdbc-type>
-            <sql-type>LONG VARCHAR</sql-type>
-         </mapping>
-         <!-- NOTE: This alternative mapping has been suggested for cloudscape
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(256)</sql-type>
-         </mapping> -->
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>TIMESTAMP</sql-type>
-         </mapping>
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>JAVA_OBJECT</jdbc-type>
-            <sql-type>LONG VARBINARY</sql-type>
-         </mapping>
-      </type-mapping>
-
-
-      <type-mapping>
-         <name>InformixDB</name>
-         <row-locking-template>select ?1 from ?2 where ?3 order by ?4 for update</row-locking-template>
-         <pk-constraint-template>PRIMARY KEY (?2) CONSTRAINT ?1</pk-constraint-template>
-         <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT FOREIGN KEY (?3) REFERENCES ?4 (?5) CONSTRAINT ?2</fk-constraint-template>
-         <auto-increment-template>?1 serial(1)</auto-increment-template>
-         <alias-header-prefix>t</alias-header-prefix>
-         <alias-header-suffix>_</alias-header-suffix>
-         <alias-max-length>32</alias-max-length>
-         <subquery-supported>true</subquery-supported>
-         <true-mapping>1</true-mapping>
-         <false-mapping>0</false-mapping>
-
-         <function-mapping>
-            <function-name>count</function-name>
-            <function-sql>count(?1)</function-sql>
-         </function-mapping>
-
-         <mapping>
-            <java-type>java.lang.Character</java-type>
-            <jdbc-type>CHAR</jdbc-type>
-            <sql-type>CHAR(1)</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.String</java-type>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(255,0)</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.math.BigDecimal</java-type>
-            <jdbc-type>NUMERIC</jdbc-type>
-            <sql-type>DECIMAL</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Boolean</java-type>
-            <jdbc-type>BIT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Integer</java-type>
-            <jdbc-type>INTEGER</jdbc-type>
-            <sql-type>INTEGER</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Long</java-type>
-            <jdbc-type>BIGINT</jdbc-type>
-            <sql-type>NUMERIC(18,0)</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Float</java-type>
-            <jdbc-type>REAL</jdbc-type>
-            <sql-type>FLOAT</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Double</java-type>
-            <jdbc-type>DOUBLE</jdbc-type>
-            <sql-type>DOUBLE PRECISION</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Byte</java-type>
-            <jdbc-type>TINYINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Short</java-type>
-            <jdbc-type>SMALLINT</jdbc-type>
-            <sql-type>SMALLINT</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.util.Date</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATETIME YEAR TO FRACTION(3)</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.sql.Date</java-type>
-            <jdbc-type>DATE</jdbc-type>
-            <sql-type>DATE</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.sql.Time</java-type>
-            <jdbc-type>TIME</jdbc-type>
-            <sql-type>TIME</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.sql.Timestamp</java-type>
-            <jdbc-type>TIMESTAMP</jdbc-type>
-            <sql-type>DATETIME YEAR TO FRACTION(3)</sql-type>
-         </mapping>
-
-         <mapping>
-            <java-type>java.lang.Object</java-type>
-            <jdbc-type>BLOB</jdbc-type>
-            <sql-type>BLOB</sql-type>
-         </mapping>
-      </type-mapping>
-
-      <type-mapping>
-          <name>Mimer SQL</name>
-          <row-locking-template/>
-          <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-          <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-          <alias-header-prefix>t</alias-header-prefix>
-          <alias-header-suffix>_</alias-header-suffix>
-          <alias-max-length>32</alias-max-length>
-          <subquery-supported>true</subquery-supported>
-          <true-mapping>1</true-mapping>
-          <false-mapping>0</false-mapping>
-
-          <mapping>
-             <java-type>java.lang.Boolean</java-type>
-             <jdbc-type>BIT</jdbc-type>
-             <sql-type>SMALLINT</sql-type>
-          </mapping>
-
-          <mapping>
-             <java-type>java.lang.Byte</java-type>
-             <jdbc-type>TINYINT</jdbc-type>
-             <sql-type>SMALLINT</sql-type>
-          </mapping>
-
-          <mapping>
-             <java-type>java.lang.Short</java-type>
-             <jdbc-type>SMALLINT</jdbc-type>
-             <sql-type>SMALLINT</sql-type>
-          </mapping>
-
-          <mapping>
-             <java-type>java.lang.Integer</java-type>
-             <jdbc-type>INTEGER</jdbc-type>
-             <sql-type>INTEGER</sql-type>
-          </mapping>
-
-          <mapping>
-             <java-type>java.lang.Long</java-type>
-             <jdbc-type>BIGINT</jdbc-type>
-             <sql-type>BIGINT</sql-type>
-          </mapping>
-
-          <mapping>
-             <java-type>java.lang.Float</java-type>
-             <jdbc-type>REAL</jdbc-type>
-             <sql-type>REAL</sql-type>
-          </mapping>
-
-          <mapping>
-             <java-type>java.lang.Double</java-type>
-             <jdbc-type>DOUBLE</jdbc-type>
-             <sql-type>DOUBLE PRECISION</sql-type>
-          </mapping>
-
-          <mapping>
-             <java-type>java.lang.Character</java-type>
-             <jdbc-type>CHAR</jdbc-type>
-             <sql-type>CHAR</sql-type>
-          </mapping>
-
-          <mapping>
-             <java-type>java.lang.String</java-type>
-             <jdbc-type>VARCHAR</jdbc-type>
-             <sql-type>VARCHAR(5000)</sql-type>
-          </mapping>
-
-          <mapping>
-             <java-type>java.sql.Date</java-type>
-             <jdbc-type>DATE</jdbc-type>
-             <sql-type>DATE</sql-type>
-          </mapping>
-
-          <mapping>
-             <java-type>java.sql.Time</java-type>
-             <jdbc-type>TIME</jdbc-type>
-             <sql-type>TIME</sql-type>
-          </mapping>
-
-          <mapping>
-             <java-type>java.sql.Timestamp</java-type>
-             <jdbc-type>TIMESTAMP</jdbc-type>
-             <sql-type>TIMESTAMP</sql-type>
-          </mapping>
-
-          <mapping>
-             <java-type>java.lang.Object</java-type>
-             <jdbc-type>JAVA_OBJECT</jdbc-type>
-             <sql-type>VARBINARY(5000)</sql-type>
-          </mapping>
-       </type-mapping>
-   </type-mappings>
-
-   <entity-commands>
-      <!-- default command; doesn't support unknown-pk -->
-      <entity-command name="default"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.JDBCCreateEntityCommand"/>
-
-      <!-- variation on default that skips select before insert -->
-      <entity-command name="no-select-before-insert"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.JDBCCreateEntityCommand">
-         <attribute name="SQLExceptionProcessor">jboss.jdbc:service=SQLExceptionProcessor</attribute>
-      </entity-command>
-
-      <!-- fetches next key value with the specified sql statement -->
-      <entity-command name="pk-sql"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCPkSqlCreateCommand">
-         <!-- change to define SQL used to obtain key prior to insert -->
-         <attribute name="pk-sql">SELECT CURRENT_TIMESTAMP</attribute>
-      </entity-command>
-
-      <!-- this command requires auto-increment element for unknown-pk -->
-      <entity-command name="mysql-get-generated-keys"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCMySQLCreateCommand">
-         <!-- uncomment in case of XADataSource <attribute name="class-name">com.mysql.jdbc.jdbc2.optional.PreparedStatementWrapper</attribute>  -->
-      </entity-command>
-
-      <!-- this command requires the specified sequence to have been created -->
-      <entity-command name="oracle-sequence"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCOracleCreateCommand">
-         <attribute name="sequence">TEST_SEQUENCE</attribute>
-      </entity-command>
-
-      <!-- this command makes the use of a specific sequence for each table -->
-      <entity-command name="oracle-table-sequence"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCOracleSequenceCreateCommand">
-         <attribute name="sequence_name">%%t_seq</attribute>
-      </entity-command>
-
-      <!-- retrieves generated key of the record inserted into hsql db -->
-      <entity-command name="hsqldb-fetch-key"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCHsqldbCreateCommand">
-         <!-- uncomment to change SQL statement used to obtain identity
-         <attribute name="pk-sql">CALL IDENTITY()</attribute>
-         -->
-      </entity-command>
-
-      <!-- retrieves generated key of the record inserted into sybase db -->
-      <entity-command name="sybase-fetch-key"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCSybaseCreateCommand"/>
-
-      <!-- retrieves generated key of the record inserted into SQLServer db -->
-      <entity-command name="mssql-fetch-key"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCSQLServerCreateCommand">
-         <!-- uncomment for versions prior to SQL Server 2000
-         <attribute name="pk-sql">SELECT @@IDENTITY</attribute>
-         -->
-      </entity-command>
-
-      <!-- retrieves serial value of the record inserted into informix db -->
-      <entity-command name="informix-serial"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCInformixCreateCommand">
-         <!-- uncomment to use with SERIAL8 column
-         <attribute name="method">getSerial8</attribute>
-         -->
-      </entity-command>
-
-      <!-- retrieves the currval of the the sequence associated with a PostgreSQL SERIAL column -->
-      <entity-command name="postgresql-fetch-seq"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCPostgreSQLCreateCommand">
-         <!-- uncomment to change the name of the sequence; default is ${table}_${pkColumn}_seq
-         <attribute name="sequence"></attribute>
-         -->
-      </entity-command>
-
-      <!-- uses key generator to fetch the next key value -->
-      <entity-command name="key-generator"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCKeyGeneratorCreateCommand">
-         <attribute name="key-generator-factory">UUIDKeyGeneratorFactory</attribute>
-      </entity-command>
-
-      <!-- uses JDBC 3.0 getGeneratedKeys() method -->
-      <entity-command name="get-generated-keys"
-                      class="org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBC30GeneratedKeysCreateCommand"/>
-
-      <!-- pk-sql for jdbc2 pm -->
-      <entity-command name="jdbc2pm-pk-sql"
-                      class="org.jboss.ejb.plugins.cmp.jdbc2.PkSqlCreateCommand">
-         <!-- change to define SQL used to obtain key prior to insert -->
-         <attribute name="pk-sql">SELECT CURRENT_TIMESTAMP</attribute>
-      </entity-command>
-
-      <!-- retrieves generated key of the record inserted into hsql db for jdbc2 pm -->
-      <entity-command name="jdbc2pm-hsqldb-fetch-key"
-                      class="org.jboss.ejb.plugins.cmp.jdbc2.keygen.HsqldbCreateCommand">
-         <!-- uncomment to change SQL statement used to obtain identity
-         <attribute name="pk-sql">CALL IDENTITY()</attribute>
-         -->
-      </entity-command>
-
-      <!-- retrieves the currval of the the sequence associated with a PostgreSQL SERIAL column for jdbc2 pm -->
-      <entity-command name="jdbc2pm-postgresql-fetch-seq"
-                      class="org.jboss.ejb.plugins.cmp.jdbc2.keygen.PostgreSQLCreateCommand">
-         <!-- uncomment to change the name of the sequence; default is ${table}_${pkColumn}_seq
-         <attribute name="sequence"></attribute>
-         -->
-      </entity-command>
-   </entity-commands>
-
-   <!-- reserved words that should not be used as table names -->
-   <!-- JBoss will escape them by prepending a 'X' -->
-   <reserved-words>
-      	<word>alias</word>   	
-      	<word>alter</word>
-      	<word>between</word>
-      	<word>char</word>      	
-      	<word>column</word>      	
-      	<word>commit</word>
-      	<word>create</word>
-      	<word>date</word>
-      	<word>default</word>
-      	<word>delete</word>
-      	<word>drop</word>
-      	<word>file</word>
-      	<word>from</word>
-      	<word>grant</word>
-      	<word>group</word>
-      	<word>index</word>
-      	<word>integer</word>
-      	<word>join</word>
-      	<word>number</word>
-      	<word>on</word>
-      	<word>order</word>
-      	<word>primary</word>
-      	<word>public</word>
-      	<word>revoke</word>
-      	<word>rollback</word>
-      	<word>row</word>
-      	<word>select</word>
-      	<word>set</word>
-      	<word>session</word>
-      	<word>size</word>      	
-      	<word>table</word>
-      	<word>trigger</word>
-      	<word>update</word>
-      	<word>unique</word>
-      	<word>user</word>
-      	<word>varchar</word>
-      	<word>view</word>
-    </reserved-words>
-</jbosscmp-jdbc>

Copied: branches/Branch_5_x/server/src/etc/conf/minimal/bootstrap.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/bootstrap-minimal.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/minimal/bootstrap.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/minimal/bootstrap.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   The list of URLs for mc beans to load during bootstrap.
+   $Id$
+-->
+<bootstrap xmlns="urn:jboss:bootstrap:1.0">
+
+   <url>bootstrap/classloader.xml</url>
+   <url>bootstrap/aop.xml</url>
+   <url>bootstrap/jmx.xml</url>
+   <url>bootstrap/deployers.xml</url>
+   <url>bootstrap/profile.xml</url>
+
+</bootstrap>


Property changes on: branches/Branch_5_x/server/src/etc/conf/minimal/bootstrap.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: branches/Branch_5_x/server/src/etc/conf/minimal/jboss-service.xml (from rev 86969, branches/Branch_5_x/server/src/etc/conf/default/jboss-minimal.xml)
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/minimal/jboss-service.xml	                        (rev 0)
+++ branches/Branch_5_x/server/src/etc/conf/minimal/jboss-service.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<!-- ===================================================================== -->
+<!--  A minimal 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="${jboss.server.lib.url}" archives="*"/>
+
+   <!-- ==================================================================== -->
+   <!-- 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:jboss-log4j.xml</attribute>      
+      <!-- The value to assign to system property jboss.server.log.threshold
+           if it is not already set. This system property in turn controls
+           the logging threshold for the server.log file.
+           If the system property is already set when this service is created,
+           this value is ignored. -->
+      <attribute name="DefaultJBossServerLogThreshold">INFO</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>
+
+   <!-- ==================================================================== -->
+   <!-- JNDI                                                                 -->
+   <!-- ==================================================================== -->
+
+   <!-- A simple mbean wrapper around the jndi Naming object. This
+      only handles an in memory instance. The NamingService uses this
+      as the JNDI store and exposes it remotely.
+   -->
+   <mbean code="org.jnp.server.NamingBeanImpl"
+      name="jboss:service=NamingBeanImpl"
+      xmbean-dd="resource:xmdesc/NamingBean-xmbean.xml">
+   </mbean>
+   
+   <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>
+      <!-- An example of using the unifed invoker as the transport.
+         <depends optional-attribute-name="InvokerProxyFactory"
+         proxy-type="attribute">jboss:service=proxyFactory,type=unified,target=Naming</depends>
+      -->
+      <depends optional-attribute-name="Naming"
+         proxy-type="attribute">jboss:service=NamingBeanImpl</depends>
+   </mbean>   
+
+</server>


Property changes on: branches/Branch_5_x/server/src/etc/conf/minimal/jboss-service.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Deleted: branches/Branch_5_x/testsuite/src/resources/test-configs/cluster-profilesvc-0/deploy/cluster/farm-deployment-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/test-configs/cluster-profilesvc-0/deploy/cluster/farm-deployment-jboss-beans.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/testsuite/src/resources/test-configs/cluster-profilesvc-0/deploy/cluster/farm-deployment-jboss-beans.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-   
-   <bean name="FarmProfileRepositoryClusteringHandler"
-         class="org.jboss.profileservice.cluster.repository.DefaultRepositoryClusteringHandler">
-         
-      <property name="partition"><inject bean="HAPartition"/></property>
-      <property name="profileName">farm</property>
-      <property name="synchronizationPolicy"><inject bean="FarmProfileSynchronizationPolicy"/></property>
-   </bean>
-   
-   <bean name="FarmProfileSynchronizationPolicy" 
-         class="org.jboss.profileservice.cluster.repository.DefaultSynchronizationPolicy">
-      <property name="timestampService"><inject bean="TimestampDiscrepancyService"/></property>
-   </bean>
-
-</deployment>

Deleted: branches/Branch_5_x/testsuite/src/resources/test-configs/cluster-profilesvc-1/deploy/cluster/farm-deployment-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/test-configs/cluster-profilesvc-1/deploy/cluster/farm-deployment-jboss-beans.xml	2009-04-09 14:22:01 UTC (rev 87077)
+++ branches/Branch_5_x/testsuite/src/resources/test-configs/cluster-profilesvc-1/deploy/cluster/farm-deployment-jboss-beans.xml	2009-04-09 14:23:47 UTC (rev 87078)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-   
-   <bean name="FarmProfileRepositoryClusteringHandler"
-         class="org.jboss.profileservice.cluster.repository.DefaultRepositoryClusteringHandler">
-         
-      <property name="partition"><inject bean="HAPartition"/></property>
-      <property name="profileName">farm</property>
-      <property name="synchronizationPolicy"><inject bean="FarmProfileSynchronizationPolicy"/></property>
-   </bean>
-   
-   <bean name="FarmProfileSynchronizationPolicy" 
-         class="org.jboss.profileservice.cluster.repository.DefaultSynchronizationPolicy">
-      <property name="timestampService"><inject bean="TimestampDiscrepancyService"/></property>
-   </bean>
-
-</deployment>




More information about the jboss-cvs-commits mailing list