[jboss-cvs] JBossAS SVN: r108934 - in branches/JBPAPP_5_1_datagrid: cluster/src/installers/datagrid and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 27 09:51:37 EDT 2010
Author: galder.zamarreno at jboss.com
Date: 2010-10-27 09:51:36 -0400 (Wed, 27 Oct 2010)
New Revision: 108934
Modified:
branches/JBPAPP_5_1_datagrid/build/build-distr.xml
branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-hotrod.properties
branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-memcached.properties
branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-rest.properties
branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-jboss-beans.xml
branches/JBPAPP_5_1_datagrid/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
Log:
JBPAPP-5268 - EDG: Anomalies in use of ServiceBindingManager - Fixed integration with SBM. Changed default Hot Rod port and added commented optional server properties with a pointer to their explanation.
Modified: branches/JBPAPP_5_1_datagrid/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/build/build-distr.xml 2010-10-27 13:26:47 UTC (rev 108933)
+++ branches/JBPAPP_5_1_datagrid/build/build-distr.xml 2010-10-27 13:51:36 UTC (rev 108934)
@@ -1144,10 +1144,14 @@
<fileset dir="${org.jboss.netty.lib}" excludes="*-sources.jar" />
<fileset dir="${org.jboss.marshalling.lib}" excludes="*sources.jar"/>
<fileset dir="${org.scala.lang.lib}" includes="scala-library.jar"/>
+ </copy>
+
+ <!-- Move jgroups stack files to root of sar for easy access by Infinispan -->
+ <move todir="${_deploy.sar}">
<fileset dir="${_datagrid.root}">
- <include name="jgroups-datagrid-*"/>
+ <include name="jgroups-datagrid-*"/>
</fileset>
- </copy>
+ </move>
<!-- The configuration files below get built automatically into the extras/datagrid directory.
These need to get moved into the META-INF directory of the exploded sar-->
Modified: branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-hotrod.properties
===================================================================
--- branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-hotrod.properties 2010-10-27 13:26:47 UTC (rev 108933)
+++ branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-hotrod.properties 2010-10-27 13:51:36 UTC (rev 108934)
@@ -1,4 +1,17 @@
enabled = true
+# Service Binding Manager sets the system properties below according to the port setup chosen
infinispan.server.host = ${jboss.infinispan.hotrod.server.host:127.0.0.1}
-infinispan.server.port = ${jboss.infinispan.hotrod.server.port:11216}
+infinispan.server.port = ${jboss.infinispan.hotrod.server.port:11222}
+# Other Infinispan server properties can be found below including their default values
+# Detailed information on these properties can be found in http://community.jboss.org/docs/DOC-15601
+
+# infinispan.server.master_threads = 0
+# infinispan.server.worker_threads = 0
+# infinispan.server.cache_config =
+# infinispan.server.idle_timeout = -1
+# infinispan.server.tcp_no_delay = true
+# infinispan.server.send_buf_size = 0
+# infinispan.server.recv_buf_size = 0
+# infinispan.server.proxy_host = // same as server host
+# infinispan.server.proxy_port = // same as server port
Modified: branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-memcached.properties
===================================================================
--- branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-memcached.properties 2010-10-27 13:26:47 UTC (rev 108933)
+++ branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-memcached.properties 2010-10-27 13:51:36 UTC (rev 108934)
@@ -1,4 +1,18 @@
enabled = true
+# Service Binding Manager sets the system properties below according to the port setup chosen
infinispan.server.host = ${jboss.infinispan.memcached.server.host:127.0.0.1}
infinispan.server.port = ${jboss.infinispan.memcached.server.port:11211}
+# Other Infinispan server properties can be found below including their default values
+# Detailed information on these properties can be found in http://community.jboss.org/docs/DOC-15601
+
+# infinispan.server.master_threads = 0
+# infinispan.server.worker_threads = 0
+# infinispan.server.cache_config =
+# infinispan.server.idle_timeout = -1
+# infinispan.server.tcp_no_delay = true
+# infinispan.server.send_buf_size = 0
+# infinispan.server.recv_buf_size = 0
+# infinispan.server.proxy_host = // same as server host
+# infinispan.server.proxy_port = // same as server port
+
Modified: branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-rest.properties
===================================================================
--- branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-rest.properties 2010-10-27 13:26:47 UTC (rev 108933)
+++ branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-rest.properties 2010-10-27 13:51:36 UTC (rev 108934)
@@ -1,3 +1 @@
enabled = true
-
-
Modified: branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-jboss-beans.xml 2010-10-27 13:26:47 UTC (rev 108933)
+++ branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-jboss-beans.xml 2010-10-27 13:51:36 UTC (rev 108934)
@@ -10,39 +10,7 @@
<bean name="HotRodServer" class="org.infinispan.server.hotrod.HotRodServer">
<install method="start">
- <!--
- <parameter class="java.util.Properties">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String" name="">
- <entry>
- <key>infinispan.server.host</key>
- <value>
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding">
- <parameter>HotRodServer</parameter>
- <parameter><null /></parameter>
- <parameter><null/></parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>11311</parameter>
- </value-factory>
- </value>
- </entry>
- <entry>
- <key>infinispan.server.port</key>
- <value>
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding">
- <parameter>HotRodServer</parameter>
- <parameter>
- <null />
- </parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>11311</parameter>
- </value-factory>
- </value>
- </entry>
- </map>
- </parameter> -->
- <parameter class="java.lang.String">${jboss.infinispan.hotrod.properties:META-INF/datagrid-endpoint-hotrod.properties}</parameter>
+ <parameter class="java.lang.String">${jboss.infinispan.hotrod.server.properties:META-INF/datagrid-endpoint-hotrod.properties}</parameter>
<parameter class="org.infinispan.manager.EmbeddedCacheManager">
<inject bean="DefaultCacheManager"/>
</parameter>
@@ -52,43 +20,12 @@
<bean name="MemcachedServer" class="org.infinispan.server.memcached.MemcachedServer">
<install method="start">
- <!--
- <parameter class="java.util.Properties">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>infinispan.server.host</key>
- <value>
- <value-factory bean="ServiceBindingManager"
- method="getStringBinding">
- <parameter>MemcachedServer</parameter>
- <parameter><null /></parameter>
- <parameter><null/></parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>11211</parameter>
- </value-factory>
- </value>
- </entry>
- <entry>
- <key>infinispan.server.port</key>
- <value>
- <value-factory bean="ServiceBindingManager"
- method="getIntBinding">
- <parameter>MemcachedServer</parameter>
- <parameter><null /></parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>11211</parameter>
- </value-factory>
- </value>
- </entry>
- </map>
- </parameter> -->
- <parameter class="java.lang.String">${jboss.infinispan.memcached.properties:META-INF/datagrid-endpoint-memcached.properties}</parameter>
+ <parameter class="java.lang.String">${jboss.infinispan.memcached.server.properties:META-INF/datagrid-endpoint-memcached.properties}</parameter>
<parameter class="org.infinispan.manager.EmbeddedCacheManager">
<inject bean="DefaultCacheManager"/>
</parameter>
</install>
</bean>
-
</deployment>
Modified: branches/JBPAPP_5_1_datagrid/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml 2010-10-27 13:26:47 UTC (rev 108933)
+++ branches/JBPAPP_5_1_datagrid/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml 2010-10-27 13:51:36 UTC (rev 108934)
@@ -577,13 +577,13 @@
<property name="serviceName">Infinispan</property>
<property name="bindingName">HotRodServer</property>
<property name="hostName">${jboss.bind.address:127.0.0.1}</property>
- <property name="port">11216</property>
+ <property name="port">11222</property>
<property name="description">Socket on which Infinispan's HotRod server listens</property>
</bean>
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">Infinispan</property>
- <property name="bindingName">Memcached</property>
+ <property name="bindingName">MemcachedServer</property>
<property name="hostName">${jboss.bind.address:127.0.0.1}</property>
<property name="port">11211</property>
<property name="description">Socket on which Infinispan's memcached server listens</property>
@@ -962,53 +962,52 @@
</constructor>
</bean>
<!-- Infinispan Tech Preview sockets -->
- <bean class="org.jboss.services.binding.SystemPropertyBinding">
- <constructor>
- <parameter>jboss.infinispan.hotrod.server.host</parameter>
- <parameter class="java.lang.String">
- <value-factory bean="ServiceBindingManager" method="getStringBinding">
- <parameter>Infinispan</parameter>
- <parameter>HotRodServer</parameter>
- <parameter><null/></parameter>
- </value-factory>
- </parameter>
- </constructor>
- </bean>
- <bean class="org.jboss.services.binding.SystemPropertyBinding">
- <constructor>
- <parameter>jboss.infinispan.hotrod.server.port</parameter>
- <parameter class="int">
- <value-factory bean="ServiceBindingManager" method="getIntBinding">
- <parameter>Infinispan</parameter>
- <parameter>HotRodServer</parameter>
- </value-factory>
- </parameter>
- </constructor>
- </bean>
- <bean class="org.jboss.services.binding.SystemPropertyBinding">
- <constructor>
- <parameter>jboss.infinispan.memcached.server.host</parameter>
- <parameter class="java.lang.String">
- <value-factory bean="ServiceBindingManager" method="getStringBinding">
- <parameter>Infinispan</parameter>
- <parameter>Memcached</parameter>
- <parameter><null/></parameter>
- </value-factory>
- </parameter>
- </constructor>
- </bean>
- <bean class="org.jboss.services.binding.SystemPropertyBinding">
- <constructor>
- <parameter>jboss.infinispan.memcached.server.port</parameter>
- <parameter class="int">
- <value-factory bean="ServiceBindingManager" method="getIntBinding">
- <parameter>Infinispan</parameter>
- <parameter>Memcached</parameter>
- </value-factory>
- </parameter>
- </constructor>
- </bean>
-
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.infinispan.hotrod.server.host</parameter>
+ <parameter class="java.lang.String">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>Infinispan</parameter>
+ <parameter>HotRodServer</parameter>
+ <parameter><null/></parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.infinispan.hotrod.server.port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>Infinispan</parameter>
+ <parameter>HotRodServer</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.infinispan.memcached.server.host</parameter>
+ <parameter class="java.lang.String">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>Infinispan</parameter>
+ <parameter>MemcachedServer</parameter>
+ <parameter><null/></parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.infinispan.memcached.server.port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>Infinispan</parameter>
+ <parameter>MemcachedServer</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
</set>
</parameter>
</constructor>
More information about the jboss-cvs-commits
mailing list