[jboss-cvs] JBoss Messaging SVN: r6576 - trunk/examples/javaee/jms-bridge/config.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2009-04-27 09:10:46 -0400 (Mon, 27 Apr 2009)
New Revision: 6576

Modified:
   trunk/examples/javaee/jms-bridge/config/jms-bridge-jboss-beans.xml
Log:
Java EE JMS Bridge example

* simplified JMS Bridge POJO configuration by having a single POJO to 
describe the JNDI properties

Modified: trunk/examples/javaee/jms-bridge/config/jms-bridge-jboss-beans.xml
===================================================================
--- trunk/examples/javaee/jms-bridge/config/jms-bridge-jboss-beans.xml	2009-04-27 12:29:17 UTC (rev 6575)
+++ trunk/examples/javaee/jms-bridge/config/jms-bridge-jboss-beans.xml	2009-04-27 13:10:46 UTC (rev 6576)
@@ -57,20 +57,7 @@
        <bean name="SourceCFF" class="org.jboss.messaging.jms.bridge.impl.JNDIConnectionFactoryFactory">
            <constructor>
                <parameter>
-                   <map class="java.util.Hashtable" keyClass="java.lang.String" valueClass="java.lang.String">
-                         <entry>
-                             <key>java.naming.factory.initial</key>
-                             <value>org.jnp.interfaces.NamingContextFactory</value>
-                         </entry>
-                         <entry>
-                             <key>java.naming.provider.url</key>
-                             <value>jnp://localhost:1099</value>
-                         </entry>
-                         <entry>
-                             <key>java.naming.factory.url.pkgs</key>
-                             <value>org.jboss.naming:org.jnp.interfaces"</value>
-                         </entry>
-                     </map>
+                   <inject bean="JNDI" />
                </parameter>
                <parameter>/ConnectionFactory</parameter>
            </constructor>  
@@ -79,20 +66,7 @@
        <bean name="TargetCFF" class="org.jboss.messaging.jms.bridge.impl.JNDIConnectionFactoryFactory">
            <constructor>
                <parameter>
-                   <map class="java.util.Hashtable" keyClass="java.lang.String" valueClass="java.lang.String">
-                         <entry>
-                             <key>java.naming.factory.initial</key>
-                             <value>org.jnp.interfaces.NamingContextFactory</value>
-                         </entry>
-                         <entry>
-                             <key>java.naming.provider.url</key>
-                             <value>jnp://localhost:1099</value>
-                         </entry>
-                         <entry>
-                             <key>java.naming.factory.url.pkgs</key>
-                             <value>org.jboss.naming:org.jnp.interfaces"</value>
-                         </entry>
-                     </map>
+                   <inject bean="JNDI" />
                </parameter>
                <parameter>/ConnectionFactory</parameter>
            </constructor>  
@@ -101,20 +75,7 @@
        <bean name="SourceDestinationFactory" class="org.jboss.messaging.jms.bridge.impl.JNDIDestinationFactory">
            <constructor>
                <parameter>
-                    <map class="java.util.Hashtable" keyClass="java.lang.String" valueClass="java.lang.String">
-                          <entry>
-                              <key>java.naming.factory.initial</key>
-                              <value>org.jnp.interfaces.NamingContextFactory</value>
-                          </entry>
-                          <entry>
-                              <key>java.naming.provider.url</key>
-                              <value>jnp://localhost:1099</value>
-                          </entry>
-                          <entry>
-                              <key>java.naming.factory.url.pkgs</key>
-                              <value>org.jboss.naming:org.jnp.interfaces"</value>
-                          </entry>
-                      </map>
+                   <inject bean="JNDI" />
                </parameter>
                <parameter>/queue/source</parameter>
            </constructor>  
@@ -123,45 +84,30 @@
        <bean name="TargetDestinationFactory" class="org.jboss.messaging.jms.bridge.impl.JNDIDestinationFactory">
            <constructor>
                <parameter>
-                   <map class="java.util.Hashtable" keyClass="java.lang.String" valueClass="java.lang.String">
-                         <entry>
-                             <key>java.naming.factory.initial</key>
-                             <value>org.jnp.interfaces.NamingContextFactory</value>
-                         </entry>
-                         <entry>
-                             <key>java.naming.provider.url</key>
-                             <value>jnp://localhost:1099</value>
-                         </entry>
-                         <entry>
-                             <key>java.naming.factory.url.pkgs</key>
-                             <value>org.jboss.naming:org.jnp.interfaces"</value>
-                         </entry>
-                     </map>
+                   <inject bean="JNDI" />
                </parameter>
                <parameter>/queue/target</parameter>
            </constructor>  
        </bean>
-
-    <!--
-       <bean name="JNDIProperties" class="java.util.Hashtable">
-           <property key="map">
-            <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
+       
+      <bean name="JNDI" class="java.util.Hashtable">
+         <constructor class="java.util.Map">
+            <map class="java.util.Hashtable" keyClass="java.lang.String"
+                                             valueClass="java.lang.String">
                <entry>
-                   <key>java.naming.factory.initial</key>
-                   <value>org.jnp.interfaces.NamingContextFactory</value>
+                  <key>java.naming.factory.initial</key>
+                  <value>org.jnp.interfaces.NamingContextFactory</value>
                </entry>
                <entry>
-                   <key>java.naming.provider.url</key>
-                   <value>jnp://localhost:1099</value>
+                  <key>java.naming.provider.url</key>
+                  <value>jnp://localhost:1099</value>
                </entry>
                <entry>
-                   <key>java.naming.factory.url.pkgs</key>
-                   <value>org.jboss.naming:org.jnp.interfaces"</value>
+                  <key>java.naming.factory.url.pkgs</key>
+                  <value>org.jboss.naming:org.jnp.interfaces"</value>
                </entry>
-           </map>
-       </property>
-       </bean>
-    --> 
-       
+            </map>
+         </constructor>
+      </bean>
 
 </deployment>
\ No newline at end of file