[jboss-cvs] JBossAS SVN: r58429 - in trunk: build messaging/src/etc/deploy
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 15 21:42:44 EST 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-11-15 21:42:41 -0500 (Wed, 15 Nov 2006)
New Revision: 58429
Added:
trunk/messaging/src/etc/deploy/connection-factories-service.xml
trunk/messaging/src/etc/deploy/hsqldb-persistence-service.xml
trunk/messaging/src/etc/deploy/jms-ds.xml
trunk/messaging/src/etc/deploy/messaging-service.xml
trunk/messaging/src/etc/deploy/remoting-service.xml
Modified:
trunk/build/build-distr.xml
trunk/messaging/src/etc/deploy/destinations-service.xml
Log:
Messaging integration.
Fixed unscoped deployment configuration.
http://jira.jboss.org/jira/browse/JBMESSAGING-632
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2006-11-16 02:38:28 UTC (rev 58428)
+++ trunk/build/build-distr.xml 2006-11-16 02:42:41 UTC (rev 58429)
@@ -616,8 +616,7 @@
<include name="jbossjca-service.xml"/>
</fileset>
</copy>
- <mkdir dir="${install.all.deploy}/jms"/>
- <copy todir="${install.all.deploy}/jms" filtering="no">
+ <copy todir="${install.all.deploy}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jms-ra.rar"/>
</fileset>
@@ -657,12 +656,15 @@
<!--include name="postgres-service.xml"/-->
</fileset>
</copy>
+
+ <!--
<mkdir dir="${install.all.deploy}/jms"/>
<copy todir="${install.all.deploy}/jms" filtering="no">
<fileset dir="${_module.output}/etc/example-config">
<include name="hajndi-jms-ds.xml"/>
</fileset>
</copy>
+ -->
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
@@ -724,57 +726,57 @@
<!-- ========= -->
<!-- Messaging -->
<!-- ========= -->
- <target name="_module-messaging-most">
- <property name="_module.name" value="messaging" override="true"/>
- <property name="_module.output" override="true"
- value="${project.root}/${_module.name}/output"/>
- <!-- Copy the jboss-messaging libraries -->
- <mkdir dir="${install.all.lib}"/>
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${jboss.messaging.lib}">
- <include name="jboss-messaging.jar"/>
- </fileset>
- <fileset dir="${_module.output}/lib">
- <include name="jboss-messaging-int.jar"/>
- </fileset>
- </copy>
+ <target name="_module-messaging-most">
+ <property name="_module.name" value="messaging" override="true"/>
+ <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
- <!-- messaging sar/descriptors -->
- <mkdir dir="${install.all.deploy}/jboss-messaging.sar" />
- <unzip dest="${install.all.deploy}/jboss-messaging.sar"
- src="${jboss.messaging.lib}/jboss-messaging-scoped.sar">
- <patternset>
- <exclude name="**/*.jar"/>
- </patternset>
- </unzip>
- <!-- Overwrite the destinations and add a legacy service -->
- <copy todir="${install.all.deploy}/jboss-messaging.sar"
- file="${_module.output}/etc/deploy/destinations-service.xml" overwrite="true"/>
- <copy todir="${install.all.deploy}/jboss-messaging.sar"
- file="${_module.output}/etc/deploy/legacy-service.xml" />
-
- <!-- Copy the generated client libraries -->
- <mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${jboss.messaging.lib}">
- <include name="jboss-messaging-client.jar"/>
- </fileset>
- </copy>
+ <!-- Copy the jboss-messaging libraries -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${jboss.messaging.lib}">
+ <include name="jboss-messaging.jar"/>
+ </fileset>
+ <fileset dir="${_module.output}/lib">
+ <include name="jboss-messaging-int.jar"/>
+ </fileset>
+ </copy>
- </target>
- <target name="_module-messaging-all" depends="_module-messaging-most">
+ <!-- messaging descriptors, unscoped deployment -->
+ <mkdir dir="${install.all.deploy}/messaging"/>
+ <copy todir="${install.all.deploy}/messaging">
+ <fileset dir="${_module.output}/etc/deploy/">
+ <include name="*-service.xml"/>
+ </fileset>
+ </copy>
- <!-- Copy the generated javadocs -->
- <mkdir dir="${install.api}/${_module.name}"/>
- <copy todir="${install.api}/${_module.name}" filtering="no">
- <fileset dir="${_module.output}/api">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
+ <!-- security metadata -->
+ <mkdir dir="${install.all.conf}/props"/>
+ <copy todir="${install.all.conf}/props">
+ <fileset dir="${_module.output}/etc/deploy/">
+ <include name="messaging-*.properties"/>
+ </fileset>
+ </copy>
+ <!-- the JCA connection factory -->
+ <copy todir="${install.all.deploy}" file="${_module.output}/etc/deploy/jms-ds.xml"/>
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" file="${jboss.messaging.lib}/jboss-messaging.jar" filtering="no"/>
+ </target>
+
+ <target name="_module-messaging-all" depends="_module-messaging-most">
+
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${_module.name}"/>
+ <copy todir="${install.api}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- ==== -->
<!-- J2SE -->
<!-- ==== -->
Added: trunk/messaging/src/etc/deploy/connection-factories-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/connection-factories-service.xml 2006-11-16 02:38:28 UTC (rev 58428)
+++ trunk/messaging/src/etc/deploy/connection-factories-service.xml 2006-11-16 02:42:41 UTC (rev 58429)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Messaging Connection Factories deployment descriptor.
+
+ $Id: connection-factories-service.xml 920 2006-05-02 02:45:42Z ovidiu $
+ -->
+
+<server>
+
+ <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
+ name="jboss.messaging.destination: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>
+ <attribute name="JNDIBindings">
+ <bindings>
+ <binding>/ConnectionFactory</binding>
+ <binding>/XAConnectionFactory</binding>
+ <binding>java:/ConnectionFactory</binding>
+ <binding>java:/XAConnectionFactory</binding>
+ </bindings>
+ </attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Modified: trunk/messaging/src/etc/deploy/destinations-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/destinations-service.xml 2006-11-16 02:38:28 UTC (rev 58428)
+++ trunk/messaging/src/etc/deploy/destinations-service.xml 2006-11-16 02:42:41 UTC (rev 58429)
@@ -16,5 +16,20 @@
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>
Added: trunk/messaging/src/etc/deploy/hsqldb-persistence-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/hsqldb-persistence-service.xml 2006-11-16 02:38:28 UTC (rev 58428)
+++ trunk/messaging/src/etc/deploy/hsqldb-persistence-service.xml 2006-11-16 02:42:41 UTC (rev 58429)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Hypersonic persistence deployment descriptor.
+
+ $Id: hsqldb-persistence-service.xml 1222 2006-08-10 18:51:44Z ovidiu.feodorov at jboss.com $
+ -->
+
+<server>
+
+ <mbean code="org.jboss.messaging.core.plugin.JDBCPersistenceManager"
+ 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>
+ </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.
+ -->
+ <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>
+ </mbean>
+
+</server>
\ No newline at end of file
Added: trunk/messaging/src/etc/deploy/jms-ds.xml
===================================================================
--- trunk/messaging/src/etc/deploy/jms-ds.xml 2006-11-16 02:38:28 UTC (rev 58428)
+++ trunk/messaging/src/etc/deploy/jms-ds.xml 2006-11-16 02:42:41 UTC (rev 58429)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<connection-factories>
+
+ <!-- ==================================================================== -->
+ <!-- JMS Stuff -->
+ <!-- ==================================================================== -->
+
+ <!-- The JMS provider loader -->
+ <mbean code="org.jboss.jms.jndi.JMSProviderLoader"
+ name="jboss.messaging:service=JMSProviderLoader,name=JMSProvider">
+ <attribute name="ProviderName">DefaultJMSProvider</attribute>
+ <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute>
+ <attribute name="FactoryRef">java:/XAConnectionFactory</attribute>
+ <attribute name="QueueFactoryRef">java:/XAConnectionFactory</attribute>
+ <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.asf.ServerSessionPoolLoader"
+ name="jboss.messaging:service=ServerSessionPoolMBean,name=StdJMSPool">
+ <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
+ <attribute name="PoolName">StdJMSPool</attribute>
+ <attribute name="PoolFactoryClass">org.jboss.jms.asf.StdServerSessionPoolFactory</attribute>
+ </mbean>
+
+ <!-- JMS XA Resource adapter, use this to get transacted JMS in beans -->
+ <tx-connection-factory>
+ <jndi-name>JmsXA</jndi-name>
+ <xa-transaction/>
+ <rar-name>jms-ra.rar</rar-name>
+ <connection-definition>org.jboss.resource.adapter.jms.JmsConnectionFactory</connection-definition>
+ <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property>
+ <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property>
+ <max-pool-size>20</max-pool-size>
+ <security-domain-and-application>JmsXARealm</security-domain-and-application>
+ <depends>jboss.messaging:service=ServerPeer</depends>
+ </tx-connection-factory>
+
+</connection-factories>
Added: trunk/messaging/src/etc/deploy/messaging-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/messaging-service.xml 2006-11-16 02:38:28 UTC (rev 58428)
+++ trunk/messaging/src/etc/deploy/messaging-service.xml 2006-11-16 02:42:41 UTC (rev 58429)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The JBoss Messaging service deployment descriptor.
+
+ $Id: messaging-service.xml 1019 2006-07-17 17:15:04Z timfox $
+ -->
+
+<server>
+
+ <mbean code="org.jboss.jms.server.ServerPeer"
+ name="jboss.messaging:service=ServerPeer"
+ xmbean-dd="xmdesc/ServerPeer-xmbean.xml">
+
+ <constructor>
+ <!-- ServerPeerID -->
+ <arg type="java.lang.String" value="server.0" />
+ <!-- DefaultQueueJNDIContext -->
+ <arg type="java.lang.String" value="/queue" />
+ <!-- DefaultTopicJNDIContext -->
+ <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="SecurityDomain">java:/jaas/messaging</attribute>
+ <attribute name="DefaultSecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <!-- Plug-ins -->
+
+ <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
Added: trunk/messaging/src/etc/deploy/remoting-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/remoting-service.xml 2006-11-16 02:38:28 UTC (rev 58428)
+++ trunk/messaging/src/etc/deploy/remoting-service.xml 2006-11-16 02:42:41 UTC (rev 58429)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Messaging Remoting service deployment descriptor.
+
+ $Id: remoting-service.xml 943 2006-05-08 21:35:39Z ovidiu $
+ -->
+
+<server>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.messaging:service=Connector,transport=socket"
+ display-name="Socket transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="socket">
+ <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>
+ <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">20000</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
+ </handlers>
+ </config>
+ </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"/>
+
+</server>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list