diff --git a/glassfish-runner/messaging-platform-tck/create.jmsra.template b/glassfish-runner/messaging-platform-tck/create.jmsra.template
new file mode 100644
index 0000000000..30b052bd25
--- /dev/null
+++ b/glassfish-runner/messaging-platform-tck/create.jmsra.template
@@ -0,0 +1,147 @@
+create-connector-connection-pool --raname jmsra --connectiondefinition jakarta.jms.ConnectionFactory cfpool
+create-connector-connection-pool --raname jmsra --connectiondefinition jakarta.jms.QueueConnectionFactory qcfpool
+create-connector-connection-pool --raname jmsra --connectiondefinition jakarta.jms.TopicConnectionFactory tcfpool
+create-connector-connection-pool --raname jmsra --connectiondefinition jakarta.jms.TopicConnectionFactory --property ClientId=cts tcfpoolcts
+create-connector-connection-pool --raname jmsra --connectiondefinition jakarta.jms.TopicConnectionFactory --property ClientId=cts1 tcfpoolcts1
+create-connector-connection-pool --raname jmsra --connectiondefinition jakarta.jms.TopicConnectionFactory --property ClientId=cts2 tcfpoolcts2
+create-connector-connection-pool --raname jmsra --connectiondefinition jakarta.jms.TopicConnectionFactory --property ClientId=cts3 tcfpoolcts3
+create-connector-connection-pool --raname jmsra --connectiondefinition jakarta.jms.TopicConnectionFactory --property ClientId=cts4 tcfpoolcts4
+create-connector-connection-pool --raname jmsra --connectiondefinition jakarta.jms.TopicConnectionFactory --property ClientId=cts5 tcfpoolcts5
+create-connector-connection-pool --raname jmsra --connectiondefinition jakarta.jms.TopicConnectionFactory --property ClientId=cts6 tcfpoolcts6
+create-connector-resource --poolname cfpool jms/ConnectionFactory
+create-connector-resource --poolname qcfpool jms/QueueConnectionFactory 
+create-connector-resource --poolname tcfpool jms/TopicConnectionFactory
+create-connector-resource --poolname tcfpoolcts jms/DURABLE_SUB_CONNECTION_FACTORY
+create-connector-resource --poolname tcfpoolcts1 jms/MDBTACCESSTEST_FACTORY
+create-connector-resource --poolname tcfpoolcts2 jms/DURABLE_BMT_CONNECTION_FACTORY
+create-connector-resource --poolname tcfpoolcts3 jms/DURABLE_CMT_CONNECTION_FACTORY
+create-connector-resource --poolname tcfpoolcts4 jms/DURABLE_BMT_XCONNECTION_FACTORY
+create-connector-resource --poolname tcfpoolcts5 jms/DURABLE_CMT_XCONNECTION_FACTORY
+create-connector-resource --poolname tcfpoolcts6 jms/DURABLE_CMT_TXNS_XCONNECTION_FACTORY
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=MDB_QUEUE MDB_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=MDB_QUEUE_REPLY MDB_QUEUE_REPLY
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=MY_QUEUE MY_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=MY_QUEUE2 MY_QUEUE2
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=Q2 Q2
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=QUEUE_BMT QUEUE_BMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=fooQ fooQ
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_exceptQ_MDB_QUEUETXNS_CMT jms_ee_mdb_mdb_exceptQ_MDB_QUEUETXNS_CMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_exceptQ_MDB_QUEUE_BMT jms_ee_mdb_mdb_exceptQ_MDB_QUEUE_BMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_exceptQ_MDB_QUEUE_CMT jms_ee_mdb_mdb_exceptQ_MDB_QUEUE_CMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_exceptT_MDB_QUEUETXNS_CMT jms_ee_mdb_mdb_exceptT_MDB_QUEUETXNS_CMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_exceptT_MDB_QUEUE_BMT jms_ee_mdb_mdb_exceptT_MDB_QUEUE_BMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_exceptT_MDB_QUEUE_CMT jms_ee_mdb_mdb_exceptT_MDB_QUEUE_CMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_msgHdrQ_MDB_QUEUE jms_ee_mdb_mdb_msgHdrQ_MDB_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_msgPropsQ_MDB_QUEUE jms_ee_mdb_mdb_msgPropsQ_MDB_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_msgTypesQ1_MDB_QUEUE jms_ee_mdb_mdb_msgTypesQ1_MDB_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_msgTypesQ2_MDB_QUEUE jms_ee_mdb_mdb_msgTypesQ2_MDB_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_msgTypesQ3_MDB_QUEUE jms_ee_mdb_mdb_msgTypesQ3_MDB_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_rec_MDB_QUEUE jms_ee_mdb_mdb_rec_MDB_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_sndToQueue_MDB_QUEUE jms_ee_mdb_mdb_sndToQueue_MDB_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_sndQ_MDB_QUEUE jms_ee_mdb_mdb_sndQ_MDB_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_synchrec_MDB_QUEUE jms_ee_mdb_mdb_synchrec_MDB_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_xa_MDB_QUEUE_BMT jms_ee_mdb_xa_MDB_QUEUE_BMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_xa_MDB_QUEUE_CMT jms_ee_mdb_xa_MDB_QUEUE_CMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=testQ0 testQ0
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=testQ1 testQ1
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=testQ2 testQ2
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=testQueue2 testQueue2
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=testT0 testT0
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=testT1 testT1
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=testT2 testT2
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=MY_TOPIC MY_TOPIC
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=MY_TOPIC2 MY_TOPIC2
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=TOPIC_BMT TOPIC_BMT
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_exceptT_MDB_DURABLETXNS_CMT jms_ee_mdb_mdb_exceptT_MDB_DURABLETXNS_CMT
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_exceptT_MDB_DURABLE_BMT jms_ee_mdb_mdb_exceptT_MDB_DURABLE_BMT
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_exceptT_MDB_DURABLE_CMT jms_ee_mdb_mdb_exceptT_MDB_DURABLE_CMT
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_msgHdrT_MDB_TOPIC jms_ee_mdb_mdb_msgHdrT_MDB_TOPIC
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_msgPropsT_MDB_TOPIC jms_ee_mdb_mdb_msgPropsT_MDB_TOPIC
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_msgTypesT1_MDB_TOPIC jms_ee_mdb_mdb_msgTypesT1_MDB_TOPIC
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_msgTypesT2_MDB_TOPIC jms_ee_mdb_mdb_msgTypesT2_MDB_TOPIC
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_msgTypesT3_MDB_TOPIC jms_ee_mdb_mdb_msgTypesT3_MDB_TOPIC
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_rec_MDB_TOPIC jms_ee_mdb_mdb_rec_MDB_TOPIC
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_sndToTopic_MDB_TOPIC jms_ee_mdb_mdb_sndToTopic_MDB_TOPIC
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_mdb_sndToTopic_MDB_TOPIC_REPLY jms_ee_mdb_mdb_sndToTopic_MDB_TOPIC_REPLY
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_xa_MDB_DURABLE_BMT jms_ee_mdb_xa_MDB_DURABLE_BMT
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=jms_ee_mdb_xa_MDB_DURABLE_CMT jms_ee_mdb_xa_MDB_DURABLE_CMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_bb_localaccess_mdbqaccesstest_MDB_QUEUE ejb_ee_bb_localaccess_mdbqaccesstest_MDB_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_casesensT_ReplyQueue ejb_ee_deploy_mdb_ejblink_casesensT_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_casesens_ReplyQueue ejb_ee_deploy_mdb_ejblink_casesens_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_casesens_TestBean ejb_ee_deploy_mdb_ejblink_casesens_TestBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_scopeT_ReplyQueue ejb_ee_deploy_mdb_ejblink_scopeT_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_scope_ReplyQueue ejb_ee_deploy_mdb_ejblink_scope_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_scope_TestBean ejb_ee_deploy_mdb_ejblink_scope_TestBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_singleT_ReplyQueue ejb_ee_deploy_mdb_ejblink_singleT_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_single_ReplyQueue ejb_ee_deploy_mdb_ejblink_single_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_single_TestBean ejb_ee_deploy_mdb_ejblink_single_TestBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_single_TestBeanBMT ejb_ee_deploy_mdb_ejblink_single_TestBeanBMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_casesensT_ReplyQueue ejb_ee_deploy_mdb_ejbref_casesensT_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_casesens_ReplyQueue ejb_ee_deploy_mdb_ejbref_casesens_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_casesens_TestBean ejb_ee_deploy_mdb_ejbref_casesens_TestBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_scopeT_ReplyQueue ejb_ee_deploy_mdb_ejbref_scopeT_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_scope_Cyrano ejb_ee_deploy_mdb_ejbref_scope_Cyrano
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_scope_ReplyQueue ejb_ee_deploy_mdb_ejbref_scope_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_scope_Romeo ejb_ee_deploy_mdb_ejbref_scope_Romeo
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_scope_Tristan ejb_ee_deploy_mdb_ejbref_scope_Tristan
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_singleT_ReplyQueue ejb_ee_deploy_mdb_ejbref_singleT_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_single_ReplyQueue ejb_ee_deploy_mdb_ejbref_single_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_single_TestBean ejb_ee_deploy_mdb_ejbref_single_TestBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_single_TestBeanBMT ejb_ee_deploy_mdb_ejbref_single_TestBeanBMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_casesensT_ReplyQueue ejb_ee_deploy_mdb_enventry_casesensT_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_casesens_CaseBean ejb_ee_deploy_mdb_enventry_casesens_CaseBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_casesens_CaseBeanBMT ejb_ee_deploy_mdb_enventry_casesens_CaseBeanBMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_casesens_ReplyQueue ejb_ee_deploy_mdb_enventry_casesens_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_scopeT_ReplyQueue ejb_ee_deploy_mdb_enventry_scopeT_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_scope_Bean1_MultiJar ejb_ee_deploy_mdb_enventry_scope_Bean1_MultiJar
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_scope_Bean1_SameJar ejb_ee_deploy_mdb_enventry_scope_Bean1_SameJar
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_scope_Bean2_MultiJar ejb_ee_deploy_mdb_enventry_scope_Bean2_MultiJar
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_scope_Bean2_SameJar ejb_ee_deploy_mdb_enventry_scope_Bean2_SameJar
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_scope_ReplyQueue ejb_ee_deploy_mdb_enventry_scope_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_singleT_ReplyQueue ejb_ee_deploy_mdb_enventry_singleT_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_single_AllBean ejb_ee_deploy_mdb_enventry_single_AllBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_single_AllBeanBMT ejb_ee_deploy_mdb_enventry_single_AllBeanBMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_single_BooleanBean ejb_ee_deploy_mdb_enventry_single_BooleanBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_single_ByteBean ejb_ee_deploy_mdb_enventry_single_ByteBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_single_DoubleBean ejb_ee_deploy_mdb_enventry_single_DoubleBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_single_FloatBean ejb_ee_deploy_mdb_enventry_single_FloatBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_single_IntegerBean ejb_ee_deploy_mdb_enventry_single_IntegerBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_single_LongBean ejb_ee_deploy_mdb_enventry_single_LongBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_single_ReplyQueue ejb_ee_deploy_mdb_enventry_single_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_single_ShortBean ejb_ee_deploy_mdb_enventry_single_ShortBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_single_StringBean ejb_ee_deploy_mdb_enventry_single_StringBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_resref_singleT_ReplyQueue ejb_ee_deploy_mdb_resref_singleT_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_resref_single_ReplyQueue ejb_ee_deploy_mdb_resref_single_ReplyQueue
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_resref_single_TestBean ejb_ee_deploy_mdb_resref_single_TestBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_sec_stateful_mdb_MDB_QUEUE ejb_ee_sec_stateful_mdb_MDB_QUEUE
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_ee_timer_mdb_MsgBean ejb_ee_timer_mdb_MsgBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_bb_localaccess_mdbtaccesstest_MDB_TOPIC ejb_ee_bb_localaccess_mdbtaccesstest_MDB_TOPIC
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_casesensT_TestBean ejb_ee_deploy_mdb_ejblink_casesensT_TestBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_scopeT_TestBean ejb_ee_deploy_mdb_ejblink_scopeT_TestBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_singleT_TestBean ejb_ee_deploy_mdb_ejblink_singleT_TestBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejblink_singleT_TestBeanBMT ejb_ee_deploy_mdb_ejblink_singleT_TestBeanBMT
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_casesensT_TestBean ejb_ee_deploy_mdb_ejbref_casesensT_TestBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_scopeT_Cyrano ejb_ee_deploy_mdb_ejbref_scopeT_Cyrano
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_scopeT_Romeo ejb_ee_deploy_mdb_ejbref_scopeT_Romeo
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_scopeT_Tristan ejb_ee_deploy_mdb_ejbref_scopeT_Tristan
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_singleT_TestBean ejb_ee_deploy_mdb_ejbref_singleT_TestBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_ejbref_singleT_TestBeanBMT ejb_ee_deploy_mdb_ejbref_singleT_TestBeanBMT
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_casesensT_CaseBean ejb_ee_deploy_mdb_enventry_casesensT_CaseBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_casesensT_CaseBeanBMT ejb_ee_deploy_mdb_enventry_casesensT_CaseBeanBMT
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_scopeT_Bean1_MultiJar ejb_ee_deploy_mdb_enventry_scopeT_Bean1_MultiJar
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_scopeT_Bean1_SameJar ejb_ee_deploy_mdb_enventry_scopeT_Bean1_SameJar
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_scopeT_Bean2_MultiJar ejb_ee_deploy_mdb_enventry_scopeT_Bean2_MultiJar
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_scopeT_Bean2_SameJar ejb_ee_deploy_mdb_enventry_scopeT_Bean2_SameJar
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_singleT_AllBean ejb_ee_deploy_mdb_enventry_singleT_AllBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_singleT_AllBeanBMT ejb_ee_deploy_mdb_enventry_singleT_AllBeanBMT
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_singleT_BooleanBean ejb_ee_deploy_mdb_enventry_singleT_BooleanBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_singleT_ByteBean ejb_ee_deploy_mdb_enventry_singleT_ByteBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_singleT_DoubleBean ejb_ee_deploy_mdb_enventry_singleT_DoubleBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_singleT_FloatBean ejb_ee_deploy_mdb_enventry_singleT_FloatBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_singleT_IntegerBean ejb_ee_deploy_mdb_enventry_singleT_IntegerBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_singleT_LongBean ejb_ee_deploy_mdb_enventry_singleT_LongBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_singleT_ShortBean ejb_ee_deploy_mdb_enventry_singleT_ShortBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_enventry_singleT_StringBean ejb_ee_deploy_mdb_enventry_singleT_StringBean
+create-admin-object --raname jmsra --restype jakarta.jms.Topic --property DestinationProperties=imqDestinationName\\=ejb_ee_deploy_mdb_resref_singleT_TestBean ejb_ee_deploy_mdb_resref_singleT_TestBean
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_sec_mdb_MDB_QUEUE_BMT ejb_sec_mdb_MDB_QUEUE_BMT
+create-admin-object --raname jmsra --restype jakarta.jms.Queue --property DestinationProperties=imqDestinationName\\=ejb_sec_mdb_MDB_QUEUE_CMT ejb_sec_mdb_MDB_QUEUE_CMT
diff --git a/glassfish-runner/messaging-platform-tck/jakartaeetck/logging.properties b/glassfish-runner/messaging-platform-tck/jakartaeetck/logging.properties
index 121c1ccb0d..6fb2d28d64 100644
--- a/glassfish-runner/messaging-platform-tck/jakartaeetck/logging.properties
+++ b/glassfish-runner/messaging-platform-tck/jakartaeetck/logging.properties
@@ -1,9 +1,5 @@
 handlers=java.util.logging.FileHandler,java.util.logging.ConsoleHandler
 
-org.glassfish.level=ALL
-com.sun.level=FINEST
-jakarta.enterprise.level=ALL
-
 
 tck.jakarta.platform.ant.level = FINER
 org.glassfish.appclient.client.level = FINER
diff --git a/glassfish-runner/messaging-platform-tck/pom.xml b/glassfish-runner/messaging-platform-tck/pom.xml
index 14cea4c572..941fccece7 100644
--- a/glassfish-runner/messaging-platform-tck/pom.xml
+++ b/glassfish-runner/messaging-platform-tck/pom.xml
@@ -64,13 +64,13 @@
         <exec.imqusermgr>${ri.home}/bin/imqusermgr</exec.imqusermgr>
         <exec.imqusermgr.part2></exec.imqusermgr.part2>
         <ftable>ctstable2</ftable>
-        <!-- Use JDK17 to run with GF 8.0.0-JDK17-M5 -->
-        <glassfish.version>8.0.0-JDK17-M7</glassfish.version>
         <glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
         <glassfish.lib.dir>${glassfish.home}/glassfish/lib</glassfish.lib.dir>
         <!-- Use JDK21 to run with GF 8.0.0-M5 -->
         <!-- <glassfish.version>8.0.0-M5</glassfish.version> -->
         <glassfish.toplevel.dir>glassfish8</glassfish.toplevel.dir>
+        <!-- Use JDK17 to run with GF 8.0.0-JDK17-M5 -->
+        <glassfish.version>8.0.0-JDK17-M7</glassfish.version>
         <imqbin.loc>${s1as.imqbin.loc}</imqbin.loc>
         <jakarta.platform.version>11.0.0-M2</jakarta.platform.version>
         <javadb.lib>${glassfish.home}/javadb/lib</javadb.lib>
@@ -94,10 +94,13 @@
         <pathsep>:</pathsep>
         <pool.properties>${derby.properties}</pool.properties>
         <poolName>${derby.poolName}</poolName>
+        <propName>SupportsXA=true:ProviderIntegrationMode=javabean:ConnectionFactoryClassName=com.sun.messaging.ConnectionFactory:CommonSetterMethodName=setProperty:UserName=guest:Password=guest:QueueConnectionFactoryClassName=com.sun.messaging.QueueConnectionFactory:TopicConnectionFactoryClassName=com.sun.messaging.TopicConnectionFactory:QueueClassName=com.sun.messaging.Queue:TopicClassName=com.sun.messaging.Topic:LogLevel=info:UserName=guest:Password=guest:XAQueueConnectionFactoryClassName=com.sun.messaging.XAQueueConnectionFactory:XATopicConnectionFactoryClassName=com.sun.messaging.XATopicConnectionFactory:XAConnectionFactoryClassName=com.sun.messaging.XAConnectionFactory</propName>
         <ptable>ctstable1</ptable>
         <restype>javax.sql.DataSource</restype>
         <ri.home>${project.build.directory}/${glassfish.toplevel.dir}/mq</ri.home>
+        <s1as.imq.share.lib>${javaee.home}/../mq/lib</s1as.imq.share.lib>
         <s1as.imqbin.loc>${javaee.home}/../mq/bin</s1as.imqbin.loc>
+        <s1as.lib>${javaee.home}/lib</s1as.lib>
         <sql.directory>./sql</sql.directory>
         <tck.artifactId>jms</tck.artifactId>
         <tck.version>11.0.0-SNAPSHOT</tck.version>
@@ -106,7 +109,6 @@
         <user2>cts1</user2>
         <version.jakarta.tck>11.0.0-SNAPSHOT</version.jakarta.tck>
     </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -441,7 +443,24 @@
                 <artifactId>exec-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>001-StartDatabase</id>
+                        <id>001-StartDomain</id>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <executable>${exec.asadmin}</executable>
+                            <arguments>
+                                <argument>start-domain</argument>
+                            </arguments>
+                            <successCodes>
+                                <successCode>0</successCode>
+                                <successCode>1</successCode>
+                            </successCodes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>002-StartDatabase</id>
                         <goals>
                             <goal>exec</goal>
                         </goals>
@@ -509,10 +528,40 @@
                                 <argument>--file</argument>
                                 <argument>${project.basedir}/create.jms.template</argument>
                             </arguments>
+                            <successCodes>
+                                <successCode>0</successCode>
+                                <successCode>1</successCode>
+                            </successCodes>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>12-StopDomain1</id>
+                        <id>12-createJMSRAtemplate</id>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <phase>pre-integration-test</phase>
+                        <configuration>
+                            <executable>${exec.asadmin}</executable>
+                            <arguments>
+                                <argument>--host</argument>
+                                <argument>localhost</argument>
+                                <argument>--user</argument>
+                                <argument>admin</argument>
+                                <argument>--passwordfile</argument>
+                                <argument>${project.basedir}/j2ee.pass</argument>
+                                <argument>--echo=true</argument>
+                                <argument>multimode</argument>
+                                <argument>--file</argument>
+                                <argument>${project.basedir}/create.jmsra.template</argument>
+                            </arguments>
+                            <successCodes>
+                                <successCode>0</successCode>
+                                <successCode>1</successCode>
+                            </successCodes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>13-StopDomain1</id>
                         <goals>
                             <goal>exec</goal>
                         </goals>
@@ -671,8 +720,45 @@
                             </target>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>09-copy.mq.jars</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <phase>pre-integration-test</phase>
+                        <configuration>
+                            <target>
+                                <copy file="${s1as.imq.share.lib}/imq.jar" overwrite="yes" todir="${s1as.lib}"></copy>
+                                <copy file="${s1as.imq.share.lib}/imqutil.jar" overwrite="yes" todir="${s1as.lib}"></copy>
+                                <copy file="${s1as.imq.share.lib}/imqjmx.jar" overwrite="yes" todir="${s1as.lib}"></copy>
+                                <copy file="${s1as.imq.share.lib}/imqbroker.jar" overwrite="yes" todir="${s1as.lib}"></copy>
+                            </target>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>10-create-resource-adapter-config</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <phase>pre-integration-test</phase>
+                        <configuration>
+                            <target>
+                                <echo message="create-resource-adapter-config jmsra"></echo>
+                                <exec executable="${exec.asadmin}">
+                                    <arg line=" --user admin"></arg>
+                                    <arg line=" --passwordfile ${project.basedir}/j2ee.pass"></arg>
+                                    <arg line=" --host localhost"></arg>
+                                    <arg line=" --port 4848"></arg>
+                                    <arg line=" create-resource-adapter-config"></arg>
+                                    <arg line=" --property ${propName}"></arg>
+                                    <arg line=" jmsra"></arg>
+                                </exec>
+                            </target>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>3.5.0</version>
@@ -729,6 +815,7 @@
                             </systemPropertyVariables>
                         </configuration>
                     </execution>
+
                     <execution>
                         <id>messaging-tests-javatest</id>
                         <goals>
@@ -776,6 +863,7 @@
                             </systemPropertyVariables>
                         </configuration>
                     </execution>
+
                 </executions>
             </plugin>
         </plugins>
diff --git a/glassfish-runner/messaging-platform-tck/src/test/resources/appclient-arquillian.xml b/glassfish-runner/messaging-platform-tck/src/test/resources/appclient-arquillian.xml
index 413216264c..3473c6ec31 100644
--- a/glassfish-runner/messaging-platform-tck/src/test/resources/appclient-arquillian.xml
+++ b/glassfish-runner/messaging-platform-tck/src/test/resources/appclient-arquillian.xml
@@ -46,7 +46,6 @@
                 -DwebServerHost.2=localhost \
                 -DwebServerPort.2=8080 \
                 -Ddeliverable.class=com.sun.ts.lib.deliverable.cts.CTSDeliverable \
-                -Djava.util.logging.config.file=jakartaeetck/logging.properties \
                 -jar \
                 ${clientEarDir}/${clientAppArchive}
             </property>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/mdb_msgHdrT_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/mdb_msgHdrT_ejb.jar.sun-ejb-jar.xml
index ce701dd143..541e865575 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/mdb_msgHdrT_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/mdb_msgHdrT_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-	<disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
 	<enterprise-beans>
 		<unique-id>0</unique-id>
 		<ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/mdb_msgPropsQ_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/mdb_msgPropsQ_ejb.jar.sun-ejb-jar.xml
index 6ef0865c40..0ac8e237bc 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/mdb_msgPropsQ_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/mdb_msgPropsQ_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-	<disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
 	<enterprise-beans>
 		<unique-id>0</unique-id>
 		<ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/mdb_msgPropsT_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/mdb_msgPropsT_ejb.jar.sun-ejb-jar.xml
index fd930a9242..691711190a 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/mdb_msgPropsT_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/mdb_msgPropsT_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-	<disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
 	<enterprise-beans>
 		<unique-id>0</unique-id>
 		<ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/mdb_msgTypesQ1_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/mdb_msgTypesQ1_ejb.jar.sun-ejb-jar.xml
index 4f0804a218..faa5056ebb 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/mdb_msgTypesQ1_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/mdb_msgTypesQ1_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-	<disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
 	<enterprise-beans>
 		<unique-id>0</unique-id>
 		<ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/mdb_msgTypesQ2_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/mdb_msgTypesQ2_ejb.jar.sun-ejb-jar.xml
index d712d8818a..74280a6a46 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/mdb_msgTypesQ2_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/mdb_msgTypesQ2_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-	<disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
 	<enterprise-beans>
 		<unique-id>0</unique-id>
 		<ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/mdb_msgTypesQ3_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/mdb_msgTypesQ3_ejb.jar.sun-ejb-jar.xml
index 94192874eb..9b93655569 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/mdb_msgTypesQ3_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/mdb_msgTypesQ3_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-  <disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
   <enterprise-beans>
     <unique-id>0</unique-id>
     <ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/mdb_msgTypesT1_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/mdb_msgTypesT1_ejb.jar.sun-ejb-jar.xml
index 2de4ff39c9..6ff82b8790 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/mdb_msgTypesT1_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/mdb_msgTypesT1_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-	<disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
 	<enterprise-beans>
 		<unique-id>0</unique-id>
 		<ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/mdb_msgTypesT2_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/mdb_msgTypesT2_ejb.jar.sun-ejb-jar.xml
index e2e0d7e596..dbbe701b37 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/mdb_msgTypesT2_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/mdb_msgTypesT2_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-	<disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
 	<enterprise-beans>
 		<unique-id>0</unique-id>
 		<ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/mdb_msgTypesT3_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/mdb_msgTypesT3_ejb.jar.sun-ejb-jar.xml
index a0022e2984..009f179759 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/mdb_msgTypesT3_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/mdb_msgTypesT3_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-	<disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
 	<enterprise-beans>
 		<unique-id>0</unique-id>
 		<ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/mdb_asynch_receives_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/mdb_asynch_receives_ejb.jar.sun-ejb-jar.xml
index 4f932457d0..a0dc731ead 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/mdb_asynch_receives_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/mdb_asynch_receives_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-	<disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
 	<enterprise-beans>
 		<unique-id>0</unique-id>
 		<ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/mdb_sndQ_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/mdb_sndQ_ejb.jar.sun-ejb-jar.xml
index b82224a851..b430787a22 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/mdb_sndQ_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/mdb_sndQ_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-  <disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
   <enterprise-beans>
     <unique-id>0</unique-id>
     <ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/mdb_sndToQueue_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/mdb_sndToQueue_ejb.jar.sun-ejb-jar.xml
index ff356f203f..484f5ede4c 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/mdb_sndToQueue_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/mdb_sndToQueue_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-	<disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
 	<enterprise-beans>
 		<unique-id>0</unique-id>
 		<ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/mdb_sndToTopic_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/mdb_sndToTopic_ejb.jar.sun-ejb-jar.xml
index eb78d6febb..8288ba8de5 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/mdb_sndToTopic_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/mdb_sndToTopic_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-	<disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
 	<enterprise-beans>
 		<unique-id>0</unique-id>
 		<ejb>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/mdb_synchrec_ejb.jar.sun-ejb-jar.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/mdb_synchrec_ejb.jar.sun-ejb-jar.xml
index 733a5cafdb..e2e5b4c72a 100644
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/mdb_synchrec_ejb.jar.sun-ejb-jar.xml
+++ b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/mdb_synchrec_ejb.jar.sun-ejb-jar.xml
@@ -19,7 +19,6 @@
 -->
 
 <sun-ejb-jar>
-  <disable-nonportable-jndi-names>true</disable-nonportable-jndi-names>
   <enterprise-beans>
     <unique-id>0</unique-id>
     <ejb>