[hibernate-commits] Hibernate SVN: r11602 - in trunk/HibernateExt/search: lib/test and 5 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Thu May 31 08:50:33 EDT 2007
Author: epbernard
Date: 2007-05-31 08:50:33 -0400 (Thu, 31 May 2007)
New Revision: 11602
Modified:
trunk/HibernateExt/search/changelog.txt
trunk/HibernateExt/search/lib/test/jboss-embedded-all.jar
trunk/HibernateExt/search/lib/test/thirdparty-all.jar
trunk/HibernateExt/search/src/test-resources/conf/jbossjta-properties.xml
trunk/HibernateExt/search/src/test-resources/deploy/jboss-local-jdbc.rar
trunk/HibernateExt/search/src/test-resources/deploy/jboss-xa-jdbc.rar
trunk/HibernateExt/search/src/test-resources/deploy/jms-ra.rar
trunk/HibernateExt/search/src/test-resources/deploy/messaging/connection-factories-service.xml
trunk/HibernateExt/search/src/test-resources/deploy/messaging/destinations-service.xml
trunk/HibernateExt/search/src/test-resources/deploy/messaging/hsqldb-persistence-service.xml
trunk/HibernateExt/search/src/test-resources/deploy/messaging/jms-ds.xml
trunk/HibernateExt/search/src/test-resources/deploy/messaging/messaging-service.xml
trunk/HibernateExt/search/src/test-resources/deploy/messaging/remoting-service.xml
trunk/HibernateExt/search/src/test-resources/deployers/jca-deployers-beans.xml
trunk/HibernateExt/search/src/test-resources/jndi.properties
Log:
HSEARCH-65 update JBoss Embedded to beta2
Modified: trunk/HibernateExt/search/changelog.txt
===================================================================
--- trunk/HibernateExt/search/changelog.txt 2007-05-31 02:53:19 UTC (rev 11601)
+++ trunk/HibernateExt/search/changelog.txt 2007-05-31 12:50:33 UTC (rev 11602)
@@ -27,8 +27,12 @@
* [HSEARCH-53] - Add support for projection (ie read the data from the index only)
* [HSEARCH-61] - Move from MultiSearcher to MultiReader
* [HSEARCH-62] - Support pluggable ReaderProvider strategies
+
+** Task
+ * [HSEARCH-65] - Update to JBoss Embedded beta2
+
3.0.0.Beta1 (19-03-2007)
------------------------
Modified: trunk/HibernateExt/search/lib/test/jboss-embedded-all.jar
===================================================================
(Binary files differ)
Modified: trunk/HibernateExt/search/lib/test/thirdparty-all.jar
===================================================================
(Binary files differ)
Modified: trunk/HibernateExt/search/src/test-resources/conf/jbossjta-properties.xml
===================================================================
--- trunk/HibernateExt/search/src/test-resources/conf/jbossjta-properties.xml 2007-05-31 02:53:19 UTC (rev 11601)
+++ trunk/HibernateExt/search/src/test-resources/conf/jbossjta-properties.xml 2007-05-31 12:50:33 UTC (rev 11602)
@@ -106,66 +106,60 @@
value="var"/>
-->
</properties>
- <properties depends="arjuna" name="recoverymanager">
+ <properties name="common">
+ <!-- CLF 2.0 properties -->
+ <property name="com.arjuna.common.util.logging.DebugLevel"
+ type="System" value="0x00000000"/>
+ <property name="com.arjuna.common.util.logging.FacilityLevel"
+ type="System" value="0xffffffff"/>
+ <property name="com.arjuna.common.util.logging.VisibilityLevel"
+ type="System" value="0xffffffff"/>
+ <property name="com.arjuna.common.util.logger" type="System" value="log4j"/>
+ </properties>
+ <properties depends="arjuna" name="txoj">
<!--
- Properties used only by the RecoveryManager.
+ (default is LockStore of installation - must be writeable!)
-->
<!--
- Periodic recovery settings.
- Time values in this section are in seconds.
- -->
- <!--
- Interval in seconds between initiating the periodic recovery modules.
- Default is 120 seconds.
- -->
<property
- name="com.arjuna.ats.arjuna.recovery.periodicRecoveryPeriod" value="120"/>
- <!--
- Interval in seconds between first and second pass of periodic recovery.
- Default is 10 seconds.
+ name="com.arjuna.ats.txoj.lockstore.lockStoreDir"
+ value="LockStore"/>
-->
- <property
- name="com.arjuna.ats.arjuna.recovery.recoveryBackoffPeriod" value="10"/>
<!--
- Periodic recovery modules to use. Invoked in sort-order of names.
+ (default is BasicLockStore)
-->
- <property
- name="com.arjuna.ats.arjuna.recovery.recoveryExtension1" value="com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule"/>
- <property
- name="com.arjuna.ats.arjuna.recovery.recoveryExtension2" value="com.arjuna.ats.internal.txoj.recovery.TORecoveryModule"/>
+ <property name="com.arjuna.ats.txoj.lockstore.lockStoreType" value="BasicLockStore"/>
<!--
- Expired entry removal
+ (default is NO)
-->
+ <property name="com.arjuna.ats.txoj.lockstore.multipleLockStore" value="NO"/>
<!--
- Expiry scanners to use (order of invocation is random).
- Names must begin with "com.arjuna.ats.arjuna.recovery.expiryScanner"
+ (default is YES)
-->
- <property
- name="com.arjuna.ats.arjuna.recovery.expiryScannerTransactionStatusManager" value="com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner"/>
+ <property name="com.arjuna.ats.txoj.lockstore.singleLockStore" value="YES"/>
<!--
- Interval, in hours, between running the expiry scanners.
- This can be quite long. The absolute value determines the interval -
- if the value is negative, the scan will NOT be run until after one
- interval has elapsed. If positive the first scan will be immediately
- after startup. Zero will prevent any scanning.
- Default = 12 = run immediately, then every 12 hours.
+ (default is YES)
-->
<property
- name="com.arjuna.ats.arjuna.recovery.expiryScanInterval" value="12"/>
+ name="com.arjuna.ats.txoj.lockstore.allowNestedLocking" value="YES"/>
+ </properties>
+ <properties depends="arjuna" name="jta">
<!--
- Age, in hours, for removal of transaction status manager item.
- This should be longer than any ts-using process will remain running.
- Zero = Never removed. Default is 12.
+ Support subtransactions in the JTA layer?
+ Default is NO.
-->
- <property
- name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerExpiryTime" value="12"/>
+ <property name="com.arjuna.ats.jta.supportSubtransactions" value="NO"/>
+ <property name="com.arjuna.ats.jta.jtaTMImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple"/>
<!--
- Use this to fix the port on which the TransactionStatusManager listens,
- The default behaviour is to use any free port.
- -->
- <property
- name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerPort" value="0"/>
+ com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple
+ -->
+ <property name="com.arjuna.ats.jta.jtaUTImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple"/>
<!--
+ com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple
+ -->
+ </properties>
+ <properties depends="arjuna,txoj,jta" name="recoverymanager">
+ <!--
Properties used only by the RecoveryManager.
-->
<!--
@@ -226,58 +220,6 @@
<property
name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerPort" value="0"/>
</properties>
- <properties name="common">
- <!-- CLF 2.0 properties -->
- <property name="com.arjuna.common.util.logging.DebugLevel"
- type="System" value="0x00000000"/>
- <property name="com.arjuna.common.util.logging.FacilityLevel"
- type="System" value="0xffffffff"/>
- <property name="com.arjuna.common.util.logging.VisibilityLevel"
- type="System" value="0xffffffff"/>
- <property name="com.arjuna.common.util.logger" type="System" value="log4j"/>
- </properties>
- <properties depends="arjuna" name="txoj">
- <!--
- (default is LockStore of installation - must be writeable!)
- -->
- <!--
- <property
- name="com.arjuna.ats.txoj.lockstore.lockStoreDir"
- value="LockStore"/>
- -->
- <!--
- (default is BasicLockStore)
- -->
- <property name="com.arjuna.ats.txoj.lockstore.lockStoreType" value="BasicLockStore"/>
- <!--
- (default is NO)
- -->
- <property name="com.arjuna.ats.txoj.lockstore.multipleLockStore" value="NO"/>
- <!--
- (default is YES)
- -->
- <property name="com.arjuna.ats.txoj.lockstore.singleLockStore" value="YES"/>
- <!--
- (default is YES)
- -->
- <property
- name="com.arjuna.ats.txoj.lockstore.allowNestedLocking" value="YES"/>
- </properties>
- <properties depends="arjuna" name="jta">
- <!--
- Support subtransactions in the JTA layer?
- Default is NO.
- -->
- <property name="com.arjuna.ats.jta.supportSubtransactions" value="NO"/>
- <property name="com.arjuna.ats.jta.jtaTMImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple"/>
- <!--
- com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple
- -->
- <property name="com.arjuna.ats.jta.jtaUTImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple"/>
- <!--
- com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple
- -->
- </properties>
<properties depends="jta" name="jdbc">
<!--
property name="com.arjuna.ats.jdbc.isolationLevel" value="TRANSACTION_SERIALIZABLE"/>
Modified: trunk/HibernateExt/search/src/test-resources/deploy/jboss-local-jdbc.rar
===================================================================
(Binary files differ)
Modified: trunk/HibernateExt/search/src/test-resources/deploy/jboss-xa-jdbc.rar
===================================================================
(Binary files differ)
Modified: trunk/HibernateExt/search/src/test-resources/deploy/jms-ra.rar
===================================================================
(Binary files differ)
Modified: trunk/HibernateExt/search/src/test-resources/deploy/messaging/connection-factories-service.xml
===================================================================
--- trunk/HibernateExt/search/src/test-resources/deploy/messaging/connection-factories-service.xml 2007-05-31 02:53:19 UTC (rev 11601)
+++ trunk/HibernateExt/search/src/test-resources/deploy/messaging/connection-factories-service.xml 2007-05-31 12:50:33 UTC (rev 11602)
@@ -3,16 +3,18 @@
<!--
Messaging Connection Factories deployment descriptor.
- $Id: connection-factories-service.xml 920 2006-05-02 02:45:42Z ovidiu $
+ $Id: connection-factories-service.xml 2386 2007-02-21 18:07:44Z timfox $
-->
<server>
<mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
- name="jboss.messaging.destination:service=ConnectionFactory"
+ name="jboss.messaging.connectionfactory:service=ConnectionFactory"
xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=socket</depends>
+ <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=bisocket</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+
<attribute name="JNDIBindings">
<bindings>
<binding>/ConnectionFactory</binding>
@@ -21,6 +23,7 @@
<binding>java:/XAConnectionFactory</binding>
</bindings>
</attribute>
+
</mbean>
</server>
\ No newline at end of file
Modified: trunk/HibernateExt/search/src/test-resources/deploy/messaging/destinations-service.xml
===================================================================
--- trunk/HibernateExt/search/src/test-resources/deploy/messaging/destinations-service.xml 2007-05-31 02:53:19 UTC (rev 11601)
+++ trunk/HibernateExt/search/src/test-resources/deploy/messaging/destinations-service.xml 2007-05-31 12:50:33 UTC (rev 11602)
@@ -1,35 +1,90 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Messaging Destinations deployment descriptor.
-
- $Id: destinations-service.xml 927 2006-05-03 01:51:14Z ovidiu $
--->
-
-<server>
-
- <!--
- The Dead Letter Queue. This destination is a dependency of an EJB MDB container.
- -->
-
- <mbean code="org.jboss.jms.server.destination.Queue"
- name="jboss.messaging.destination:service=Queue,name=DLQ"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- </mbean>
-
- <!--
- Default test destination. Smoke tests assume they are available.
- -->
- <mbean code="org.jboss.jms.server.destination.Topic"
- name="jboss.messaging.destination:service=Topic,name=testTopic"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.Queue"
- name="jboss.messaging.destination:service=Queue,name=testQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- </mbean>
-
-</server>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Messaging Destinations deployment descriptor.
+
+ $Id: destinations-service.xml 1930 2007-01-09 18:16:04Z timfox $
+ -->
+
+<server>
+
+ <!--
+ The Default Dead Letter Queue. This destination is a dependency of an EJB MDB container.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=DLQ"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!--
+ The Default Expiry Queue.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=ExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!--
+ Example destinations.
+ -->
+
+ <!-- It's possible for indiviual queues and topics to use a specific queue for
+ an expiry or DLQ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateDLQ"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <!-- Queues and Topics can also specify their own redelivery delay -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Modified: trunk/HibernateExt/search/src/test-resources/deploy/messaging/hsqldb-persistence-service.xml
===================================================================
--- trunk/HibernateExt/search/src/test-resources/deploy/messaging/hsqldb-persistence-service.xml 2007-05-31 02:53:19 UTC (rev 11601)
+++ trunk/HibernateExt/search/src/test-resources/deploy/messaging/hsqldb-persistence-service.xml 2007-05-31 12:50:33 UTC (rev 11602)
@@ -3,35 +3,45 @@
<!--
Hypersonic persistence deployment descriptor.
- $Id: hsqldb-persistence-service.xml 1222 2006-08-10 18:51:44Z ovidiu.feodorov at jboss.com $
+ $Id: hsqldb-persistence-service.xml 2277 2007-02-12 21:51:57Z clebert.suconic at jboss.com $
-->
<server>
- <mbean code="org.jboss.messaging.core.plugin.JDBCPersistenceManager"
+ <mbean code="org.jboss.messaging.core.plugin.JDBCPersistenceManagerService"
name="jboss.messaging:service=PersistenceManager"
xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
- <!-- TODO this insures the fact that dependency exists. However I need to redundantly specifiy
- the DataSource JNDI name in order to actually get a reference to it. Fix this.
- -->
<depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
<depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
- <depends optional-attribute-name="ChannelMapper">jboss.messaging:service=ChannelMapper</depends>
<attribute name="DataSource">java:/DefaultDS</attribute>
<attribute name="CreateTablesOnStartup">true</attribute>
- <attribute name="UsingBatchUpdates">true</attribute>
+ <attribute name="UsingBatchUpdates">false</attribute>
+ <attribute name="MaxParams">500</attribute>
</mbean>
- <mbean code="org.jboss.jms.server.plugin.JDBCChannelMapper"
- name="jboss.messaging:service=ChannelMapper"
- xmbean-dd="xmdesc/JDBCChannelMapper-xmbean.xml">
- <!-- TODO this insures the fact that dependency exists. However I need to redundantly specifiy
- the DataSource JNDI name in order to actually get a reference to it. Fix this.
- -->
+ <!-- Note that Hypersonic CANNOT be used for clustered post offices -->
+
+ <mbean code="org.jboss.messaging.core.plugin.DefaultPostOfficeService"
+ name="jboss.messaging:service=PostOffice"
+ xmbean-dd="xmdesc/DefaultPostOffice-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
<depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+ <attribute name="PostOfficeName">JMS</attribute>
<attribute name="DataSource">java:/DefaultDS</attribute>
<attribute name="CreateTablesOnStartup">true</attribute>
- </mbean>
-
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
+ name="jboss.messaging:service=JMSUserManager"
+ xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">
+ <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+ <attribute name="DataSource">java:/DefaultDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
+ <attribute name="SqlProperties"><![CDATA[
+POPULATE.TABLES.1=INSERT INTO JBM_USER (USER_ID,PASSWD,CLIENTID) VALUES ('dilbert','dogbert','dilbert-id')
+ ]]></attribute>
+ </mbean>
+
</server>
\ No newline at end of file
Modified: trunk/HibernateExt/search/src/test-resources/deploy/messaging/jms-ds.xml
===================================================================
--- trunk/HibernateExt/search/src/test-resources/deploy/messaging/jms-ds.xml 2007-05-31 02:53:19 UTC (rev 11601)
+++ trunk/HibernateExt/search/src/test-resources/deploy/messaging/jms-ds.xml 2007-05-31 12:50:33 UTC (rev 11602)
@@ -6,7 +6,11 @@
<!-- JMS Stuff -->
<!-- ==================================================================== -->
- <!-- The JMS provider loader -->
+ <!--
+ The JMS provider loader. Currently pointing to a non-clustered ConnectionFactory. Need to
+ be replaced with a clustered non-load-balanced ConnectionFactory when it becomes available.
+ See http://jira.jboss.org/jira/browse/JBMESSAGING-843.
+ -->
<mbean code="org.jboss.jms.jndi.JMSProviderLoader"
name="jboss.messaging:service=JMSProviderLoader,name=JMSProvider">
<attribute name="ProviderName">DefaultJMSProvider</attribute>
Modified: trunk/HibernateExt/search/src/test-resources/deploy/messaging/messaging-service.xml
===================================================================
--- trunk/HibernateExt/search/src/test-resources/deploy/messaging/messaging-service.xml 2007-05-31 02:53:19 UTC (rev 11601)
+++ trunk/HibernateExt/search/src/test-resources/deploy/messaging/messaging-service.xml 2007-05-31 12:50:33 UTC (rev 11602)
@@ -3,7 +3,7 @@
<!--
The JBoss Messaging service deployment descriptor.
- $Id: messaging-service.xml 1019 2006-07-17 17:15:04Z timfox $
+ $Id: messaging-service.xml 2386 2007-02-21 18:07:44Z timfox $
-->
<server>
@@ -14,35 +14,33 @@
<constructor>
<!-- ServerPeerID -->
- <arg type="java.lang.String" value="server.0" />
+ <arg type="int" value="0"/>
<!-- DefaultQueueJNDIContext -->
- <arg type="java.lang.String" value="/queue" />
+ <arg type="java.lang.String" value="/queue"/>
<!-- DefaultTopicJNDIContext -->
- <arg type="java.lang.String" value="/topic" />
+ <arg type="java.lang.String" value="/topic"/>
</constructor>
- <depends optional-attribute-name="PersistenceManager">jboss.messaging:service=PersistenceManager</depends>
- <depends optional-attribute-name="MessageStore">jboss.messaging:service=MessageStore</depends>
- <depends optional-attribute-name="ChannelMapper">jboss.messaging:service=ChannelMapper</depends>
-
- <!-- Set to -1 to completely disable client leasing -->
+ <attribute name="PostOffice">jboss.messaging:service=PostOffice</attribute>
<attribute name="SecurityDomain">java:/jaas/messaging</attribute>
<attribute name="DefaultSecurityConfig">
<security>
<role name="guest" read="true" write="true" create="true"/>
</security>
</attribute>
- </mbean>
+ <attribute name="DefaultDLQ">jboss.messaging.destination:service=Queue,name=DLQ</attribute>
+ <attribute name="DefaultMaxDeliveryAttempts">10</attribute>
+ <attribute name="DefaultExpiryQueue">jboss.messaging.destination:service=Queue,name=ExpiryQueue</attribute>
+ <attribute name="DefaultRedeliveryDelay">0</attribute>
+ <attribute name="QueueStatsSamplePeriod">5000</attribute>
+ <attribute name="FailoverStartTimeout">3000</attribute>
+ <attribute name="FailoverCompleteTimeout">12000</attribute>
+ <attribute name="DefaultMessageCounterHistoryDayLimit">-1</attribute>
- <!-- Plug-ins -->
+ <depends optional-attribute-name="PersistenceManager">jboss.messaging:service=PersistenceManager</depends>
+ <depends optional-attribute-name="JMSUserManager">jboss.messaging:service=JMSUserManager</depends>
+ <depends>jboss.messaging:service=Connector,transport=bisocket</depends>
- <mbean code="org.jboss.messaging.core.plugin.SimpleMessageStore"
- name="jboss.messaging:service=MessageStore"
- xmbean-dd="xmdesc/SimpleMessageStore-xmbean.xml">
- <constructor>
- <!-- StoreID -->
- <arg type="java.lang.String" value="store.0" />
- </constructor>
</mbean>
</server>
\ No newline at end of file
Modified: trunk/HibernateExt/search/src/test-resources/deploy/messaging/remoting-service.xml
===================================================================
--- trunk/HibernateExt/search/src/test-resources/deploy/messaging/remoting-service.xml 2007-05-31 02:53:19 UTC (rev 11601)
+++ trunk/HibernateExt/search/src/test-resources/deploy/messaging/remoting-service.xml 2007-05-31 12:50:33 UTC (rev 11602)
@@ -3,26 +3,63 @@
<!--
Messaging Remoting service deployment descriptor.
- $Id: remoting-service.xml 943 2006-05-08 21:35:39Z ovidiu $
+ $Id: remoting-service.xml 2399 2007-02-23 01:21:29Z ovidiu.feodorov at jboss.com $
-->
<server>
<mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.messaging:service=Connector,transport=socket"
- display-name="Socket transport Connector">
+ name="jboss.messaging:service=Connector,transport=bisocket"
+ display-name="Bisocket transport Connector">
<attribute name="Configuration">
<config>
- <invoker transport="socket">
+ <invoker transport="bisocket">
<attribute name="marshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
<attribute name="unmarshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
- <attribute name="serializationtype" isParam="true">jboss</attribute>
+ <!-- Serialization type must be jms - do not change! -->
+ <attribute name="serializationtype" isParam="true">jms</attribute>
<attribute name="dataType" isParam="true">jms</attribute>
<attribute name="socket.check_connection" isParam="true">false</attribute>
<attribute name="timeout">0</attribute>
<attribute name="serverBindAddress">${jboss.bind.address}</attribute>
<attribute name="serverBindPort">4457</attribute>
+ <attribute name="leasePeriod">10000</attribute>
+ <attribute name="callbackStore">org.jboss.remoting.callback.CallbackStore</attribute>
+ <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
+ <attribute name="serverSocketClass">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
+ <attribute name="callbackErrorsAllowed">1</attribute>
+ <attribute name="numberOfRetries" isParam="true">1</attribute>
+ <attribute name="NumberOfCallRetries" isParam="true">2</attribute>
+ <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ <depends>jboss.messaging:service=NetworkRegistry</depends>
+ </mbean>
+
+ <!--
+ HTTP Connector example
+ -->
+ <!--
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.messaging:service=Connector,transport=http"
+ display-name="HTTP transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="http">
+ <attribute name="marshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
+ <!== Serialization type must be jms - do not change! ==>
+ <attribute name="serializationtype" isParam="true">jms</attribute>
+ <attribute name="dataType" isParam="true">jms</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">4458</attribute>
<attribute name="leasePeriod">20000</attribute>
+ <attribute name="callbackStore">org.jboss.remoting.callback.CallbackStore</attribute>
+ <attribute name="callbackPollPeriod" isParam="true">100</attribute>
</invoker>
<handlers>
<handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
@@ -31,7 +68,9 @@
</attribute>
<depends>jboss.messaging:service=NetworkRegistry</depends>
</mbean>
+ -->
+
<!-- TODO: Do I need this> -->
<mbean code="org.jboss.remoting.network.NetworkRegistry"
name="jboss.messaging:service=NetworkRegistry"/>
Modified: trunk/HibernateExt/search/src/test-resources/deployers/jca-deployers-beans.xml
===================================================================
--- trunk/HibernateExt/search/src/test-resources/deployers/jca-deployers-beans.xml 2007-05-31 02:53:19 UTC (rev 11601)
+++ trunk/HibernateExt/search/src/test-resources/deployers/jca-deployers-beans.xml 2007-05-31 12:50:33 UTC (rev 11602)
@@ -4,16 +4,19 @@
JCA Deployers
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
+ <bean name="JCAMetaDataRepository" class="org.jboss.resource.metadata.repository.DefaultJCAMetaDataRepository"/>
<!-- RAR Deployment -->
<bean name="RARParserDeployer" class="org.jboss.resource.deployers.RARParserDeployer">
+ <property name="metaDataRepository"><inject bean="JCAMetaDataRepository"/></property>
<install bean="MainDeployer" method="addDeployer">
<parameter><this/></parameter>
</install>
<uninstall bean="MainDeployer" method="removeDeployer">
<parameter><this/></parameter>
</uninstall>
+ <property name="type">rar</property>
</bean>
+
<bean name="RARDeployer" class="org.jboss.resource.deployers.RARDeployer">
<property name="workManagerName">jboss.jca:service=WorkManager</property>
<property name="XATerminatorName">jboss:service=TransactionManager</property>
@@ -23,9 +26,13 @@
<uninstall bean="MainDeployer" method="removeDeployer">
<parameter><this/></parameter>
</uninstall>
+ <property name="type">rar</property>
</bean>
- <!-- ConnectionFactory Deployment -->
+
+
+ <!-- ConnectionFactory Deployment -->
+
<bean name="ConnectionFactoryDeployer" class="org.jboss.system.deployers.ServiceXSLDeployer">
<property name="suffix">-ds.xml</property>
<property name="XSLPath">stylesheets/NoJRMPConnectionFactoryTemplate.xsl</property>
@@ -35,6 +42,7 @@
<uninstall bean="MainDeployer" method="removeDeployer">
<parameter><this/></parameter>
</uninstall>
+ <property name="type">jca-ds</property>
</bean>
</deployment>
Modified: trunk/HibernateExt/search/src/test-resources/jndi.properties
===================================================================
--- trunk/HibernateExt/search/src/test-resources/jndi.properties 2007-05-31 02:53:19 UTC (rev 11601)
+++ trunk/HibernateExt/search/src/test-resources/jndi.properties 2007-05-31 12:50:33 UTC (rev 11602)
@@ -1,4 +1,4 @@
# DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING
#
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.initial=org.jboss.naming.JBossRemotingContextFactory
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
More information about the hibernate-commits
mailing list