[jboss-cvs] JBossAS SVN: r108497 - in branches/JBPAPP_5_1_datagrid: cluster and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Oct 8 16:07:52 EDT 2010


Author: bstansberry at jboss.com
Date: 2010-10-08 16:07:51 -0400 (Fri, 08 Oct 2010)
New Revision: 108497

Added:
   branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/
   branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/build.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/cluster/src/installers/datagrid/infinispan-configuration.xml
   branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/jboss-structure.xml
Modified:
   branches/JBPAPP_5_1_datagrid/build/build-distr.xml
   branches/JBPAPP_5_1_datagrid/cluster/build.xml
   branches/JBPAPP_5_1_datagrid/cluster/pom.xml
   branches/JBPAPP_5_1_datagrid/component-matrix/pom.xml
   branches/JBPAPP_5_1_datagrid/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
   branches/JBPAPP_5_1_datagrid/thirdparty/pom.xml
Log:
Add the creation of the extras/datagrid profile

Modified: branches/JBPAPP_5_1_datagrid/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/build/build-distr.xml	2010-10-08 17:09:51 UTC (rev 108496)
+++ branches/JBPAPP_5_1_datagrid/build/build-distr.xml	2010-10-08 20:07:51 UTC (rev 108497)
@@ -1095,8 +1095,10 @@
     </fileset>
     </copy>
 
+    <!-- Create extras directory for ec2 and datagrid -->
+    <mkdir dir="${install.root}/extras"/>
+
   	<!-- Create the ec2 and mod_cluster-ec2 installers -->
-    <mkdir dir="${install.root}/extras"/>
     <copy todir="${install.root}/extras">
       <fileset dir="${_module.output}/installers">
         <include name="**"/>
@@ -1108,7 +1110,61 @@
         <include name="**"/>
       </fileset>
     </copy>
-  	 
+
+    <!-- Create directory structure for datagrid profile -->
+
+    <mkdir dir="${install.root}/extras/datagrid"/>
+    <property name="_datagrid.root" value="${install.root}/extras/datagrid"/>
+
+    <mkdir dir="${_datagrid.root}/deploy"/>
+    <mkdir dir="${_datagrid.root}/deployers"/>
+    <mkdir dir="${_datagrid.root}/conf"/>
+    <mkdir dir="${_datagrid.root}/lib"/>
+
+    <property name="_datagrid.deploy" value="${_datagrid.root}/deploy"/>
+    <property name="_datagrid.deployers" value="${_datagrid.root}/deployers"/>
+    <property name="_datagrid.conf" value="${_datagrid.root}/conf"/>
+    <property name="_datagrid.lib" value="${_datagrid.root}/lib"/>
+
+    <!-- Build the directory structure for the datagrid.sar directory -->
+    <mkdir dir="${_datagrid.deploy}/datagrid.sar"/>
+    <mkdir dir="${_datagrid.deploy}/datagrid.sar/META-INF"/>
+    <property name="_deploy.sar" value="${_datagrid.deploy}/datagrid.sar" />
+
+    <!-- =====================================================================================  -->
+    <!-- NOTE: Other jar files and configuration files defined by the WEB profile will be   -->
+    <!-- copied when extras/datagrid/build.xml is run                                           -->
+    <!-- =====================================================================================  -->
+
+    <!-- Copy the jar files needed for the datagrid profile -->
+    
+    <copy todir="${_deploy.sar}">
+         <fileset dir="${org.infinispan.lib}" excludes="*-sources.jar, infinispan-server-rest.war" />
+         <fileset dir="${org.jgroups.lib}" excludes="*-sources.jar" />
+         <fileset dir="${org.jboss.netty.lib}" excludes="*-sources.jar" />
+         <fileset dir="${apache.log4j.lib}" includes="log4j.jar" />
+         <fileset dir="${jboss.jnpserver.lib}" includes="*jnpserver.jar" />
+         <fileset dir="${org.jboss.marshalling.lib}" excludes="*sources.jar"/>
+         <fileset dir="${org.scala.lang.lib}" includes="scala-library.jar"/>
+    </copy>
+
+    <!-- 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-->    
+    <move todir="${_deploy.sar}/META-INF">
+        <fileset dir="${_datagrid.root}">
+            <include name="datagrid-endpoint-memcached.properties"/>
+            <include name="datagrid-endpoint-hotrod.properties"/>
+            <include name="datagrid-endpoint-rest.properties"/>
+            <include name="datagrid-jboss-beans.xml"/>
+            <include name="infinispan-configuration.xml"/>
+            <include name="jboss-structure.xml"/>
+        </fileset>
+    </move>
+    
+    <copy todir="${_deploy.sar}">
+        <fileset dir="${org.infinispan.lib}" includes="infinispan-server-rest.war" />
+    </copy>
+    
   </target>
 
   <target name="_module-cluster-all" depends="_module-cluster-most">
@@ -1129,6 +1185,7 @@
     </copy>
   </target>
 
+
   <!-- ===== -->
   <!-- Varia -->
   <!-- ===== -->

Modified: branches/JBPAPP_5_1_datagrid/cluster/build.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/cluster/build.xml	2010-10-08 17:09:51 UTC (rev 108496)
+++ branches/JBPAPP_5_1_datagrid/cluster/build.xml	2010-10-08 20:07:51 UTC (rev 108497)
@@ -77,6 +77,7 @@
       <path refid="apache.log4j.classpath"/>
       <path refid="junit.junit.classpath"/>
       <path refid="jgroups.jgroups.classpath"/>
+      <path refid="org.infinispan.classpath"/>
       <path refid="org.jboss.cluster.classpath"/>
       <path refid="oswego.concurrent.classpath"/>
       <path refid="jboss.remoting.classpath"/>

Modified: branches/JBPAPP_5_1_datagrid/cluster/pom.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/cluster/pom.xml	2010-10-08 17:09:51 UTC (rev 108496)
+++ branches/JBPAPP_5_1_datagrid/cluster/pom.xml	2010-10-08 20:07:51 UTC (rev 108497)
@@ -167,6 +167,16 @@
       <groupId>org.jboss.remoting</groupId>
       <artifactId>jboss-remoting</artifactId>
     </dependency>
+
+    <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-server-memcached</artifactId>
+    </dependency>
+
+    <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-server-hotrod</artifactId>
+    </dependency>
     
   </dependencies>
   

Added: branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/build.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/build.xml	                        (rev 0)
+++ branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/build.xml	2010-10-08 20:07:51 UTC (rev 108497)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+
+<project default="main" name="JBoss - build file for datagrid profile">
+
+    <target name="install">
+        <property name="jboss.home" value="../../"/>
+        <property name="server.datagrid" value="${jboss.home}/server/datagrid"/>
+        <property name="datagrid.deploy" value="${server.datagrid}/deploy"/>
+        <property name="datagrid.conf" value="${server.datagrid}/conf"/>
+        <property name="datagrid.deployers" value="${server.datagrid}/deployers"/>
+        <property name="datagrid.lib" value="${server.datagrid}/lib"/>
+
+        <mkdir dir="${server.datagrid}"/>
+        <mkdir dir="${datagrid.deploy}"/>
+        <mkdir dir="${datagrid.conf}"/>
+        <mkdir dir="${datagrid.deployers}"/>
+        <mkdir dir="${datagrid.lib}"/>
+        <mkdir dir="${datagrid.deploy}/jbossweb.sar"/>
+
+        <copy todir="${datagrid.conf}">
+            <fileset dir="./conf"/>
+            <fileset dir="${jboss.home}/server/web/conf" excludes="jbossts-properties.xml, jax-ws-catalog.xml"/>
+        </copy>
+        
+        <copy todir="${datagrid.deploy}/datagrid.sar">
+            <fileset dir="./deploy/datagrid.sar" excludes="infinispan-server-rest.war"/>
+        </copy>
+        
+        <copy todir="${datagrid.deploy}/jbossweb.sar">
+            <fileset dir="${jboss.home}/server/web/deploy/jbossweb.sar"/>
+        </copy>
+
+        <!-- jca-jboss-beans.xml and transaction-jboss-beans.xml are only needed because server.xml include the CachedConnectionValve.
+             Instead of including these we'll alter the JBoss Web config to eliminate the dependency.
+        <copy todir="${datagrid.deploy}">
+            <fileset dir="${jboss.home}/server/web/deploy" includes="jca-jboss-beans.xml, transaction-jboss-beans.xml"/>
+        </copy>
+        -->
+        <replace file="${datagrid.deploy}/jbossweb.sar/server.xml"
+          token="&lt;Valve className=&quot;org.jboss.web.tomcat.service.jca.CachedConnectionValve" 
+          value="&lt;!--&lt;Valve className=&quot;org.jboss.web.tomcat.service.jca.CachedConnectionValve"/>
+        <replace file="${datagrid.deploy}/jbossweb.sar/server.xml"
+          token="jboss:service=TransactionManager&quot; /&gt;" 
+          value="jboss:service=TransactionManager&quot; /&gt;--&gt;"/>
+        <replace file="${datagrid.deploy}/jbossweb.sar/META-INF/jboss-beans.xml"
+          token="&lt;depends&gt;jboss.jca:service=CachedConnectionManager&lt;/depends&gt;" 
+          value="&lt;!--&lt;depends&gt;jboss.jca:service=CachedConnectionManager&lt;/depends&gt;--&gt;"/>
+        <replace file="${datagrid.deploy}/jbossweb.sar/META-INF/jboss-beans.xml"
+          token="&lt;depends&gt;jboss:service=TransactionManager&lt;/depends&gt;" 
+          value="&lt;!--&lt;depends&gt;jboss:service=TransactionManager&lt;/depends&gt;--&gt;"/> 
+
+        <copy todir="${datagrid.deploy}/security">
+            <fileset dir="${jboss.home}/server/web/deploy/security"/>
+        </copy>        
+
+        <unwar src="./deploy/datagrid.sar/infinispan-server-rest.war" dest="${datagrid.deploy}/datagrid.sar/infinispan-server-rest.war"/>
+        
+        <copy todir="${datagrid.deployers}">
+            <fileset dir="./deployers"/>
+            <fileset dir="${jboss.home}/server/web/deployers" includes="alias-deployers-jboss-beans.xml, dependency-deployers-jboss-beans.xml, logbridge-jboss-beans.xml, metadata-deployer-jboss-beans.xml, security-deployer-jboss-beans.xml"/>
+        </copy>
+
+        <copy todir="${datagrid.deployers}/ejb3.deployer">
+            <fileset dir="${jboss.home}/server/web/deployers/ejb3.deployer" /> 
+        </copy>
+
+        <copy todir="${datagrid.deployers}/jboss-aop-jboss5.deployer">
+            <fileset dir="${jboss.home}/server/web/deployers/jboss-aop-jboss5.deployer" /> 
+        </copy>
+
+        <copy todir="${datagrid.deployers}/jboss-jca.deployer">
+            <fileset dir="${jboss.home}/server/web/deployers/jboss-jca.deployer" /> 
+        </copy>
+
+        <copy todir="${datagrid.deployers}/jboss-threads.deployer">
+            <fileset dir="${jboss.home}/server/web/deployers/jboss-threads.deployer" /> 
+        </copy>
+
+        <copy todir="${datagrid.deployers}/jbossweb.deployer">
+            <fileset dir="${jboss.home}/server/web/deployers/jbossweb.deployer" /> 
+        </copy>
+
+        <copy todir="${datagrid.lib}">
+            <fileset dir="${jboss.home}/server/web/lib" excludes="hibernate-jbosscache2.jar, river.jar" />
+        </copy>
+
+        <delete dir="${datagrid.deploy}/datagrid.sar/infinispan-server-rest.war/WEB-INF/lib/" includes="infinispan-core*, log4j*, slf4j*, jgroups*, river*, scala-library*, jboss-*"/>
+
+    </target>
+
+
+</project>
+

Added: 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	                        (rev 0)
+++ branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-hotrod.properties	2010-10-08 20:07:51 UTC (rev 108497)
@@ -0,0 +1,4 @@
+enabled = true
+infinispan.server.host = ${jboss.infinispan.hotrod.server.host:127.0.0.1}
+infinispan.server.port = ${jboss.infinispan.hotrod.server.port:11216}
+

Added: 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	                        (rev 0)
+++ branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-memcached.properties	2010-10-08 20:07:51 UTC (rev 108497)
@@ -0,0 +1,4 @@
+enabled = true
+infinispan.server.host = ${jboss.infinispan.memcached.server.host:127.0.0.1}
+infinispan.server.port = ${jboss.infinispan.memcached.server.port:11211}
+

Added: 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	                        (rev 0)
+++ branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-endpoint-rest.properties	2010-10-08 20:07:51 UTC (rev 108497)
@@ -0,0 +1,3 @@
+enabled = true
+
+

Added: 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	                        (rev 0)
+++ branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/datagrid-jboss-beans.xml	2010-10-08 20:07:51 UTC (rev 108497)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+	<bean name="DefaultCacheManager" class="org.infinispan.manager.DefaultCacheManager">
+		<constructor>
+			<parameter class="java.lang.String">META-INF/infinispan-configuration.xml</parameter>
+		</constructor>							
+	</bean>
+
+
+	<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">META-INF/datagrid-endpoint-hotrod.properties</parameter>
+			<parameter class="org.infinispan.manager.EmbeddedCacheManager"><inject bean="DefaultCacheManager" /></parameter>			
+		</install>				
+	</bean>
+
+
+	<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">META-INF/datagrid-endpoint-memcached.properties</parameter>
+			<parameter class="org.infinispan.manager.EmbeddedCacheManager"><inject bean="DefaultCacheManager" /></parameter>			
+		</install>				
+	</bean>
+
+
+</deployment>
+

Added: branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/infinispan-configuration.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/infinispan-configuration.xml	                        (rev 0)
+++ branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/infinispan-configuration.xml	2010-10-08 20:07:51 UTC (rev 108497)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<infinispan />
+

Added: branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/jboss-structure.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/jboss-structure.xml	                        (rev 0)
+++ branches/JBPAPP_5_1_datagrid/cluster/src/installers/datagrid/jboss-structure.xml	2010-10-08 20:07:51 UTC (rev 108497)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<structure>
+    <context>
+        <path name=""/>
+        <metaDataPath>
+            <path name="META-INF"/>
+        </metaDataPath>        
+        <classpath>
+            <path name=""/>
+            <path name="" suffixes=".jar" />
+        </classpath>
+    </context>
+	<context>
+	    <path name="infinispan-server-rest.war"/>
+	</context>
+</structure>

Modified: branches/JBPAPP_5_1_datagrid/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/component-matrix/pom.xml	2010-10-08 17:09:51 UTC (rev 108496)
+++ branches/JBPAPP_5_1_datagrid/component-matrix/pom.xml	2010-10-08 20:07:51 UTC (rev 108497)
@@ -51,6 +51,7 @@
     <version.org.hibernate.entity.manager>3.4.0.GA_CP03</version.org.hibernate.entity.manager>
     <version.org.hibernate.validator>3.1.0.GA</version.org.hibernate.validator>
     <version.org.hibernate>3.3.2.GA_CP03</version.org.hibernate>
+    <version.org.infinispan>4.1.0.FINAL</version.org.infinispan>
     <version.org.jboss.aop>2.1.6.GA_CP01</version.org.jboss.aop>
     <version.org.jboss.aspects.currentinvocation>1.0.1</version.org.jboss.aspects.currentinvocation>
     <version.org.jboss.aspects.remoting>1.0.3</version.org.jboss.aspects.remoting>
@@ -1082,8 +1083,45 @@
         <artifactId>jgroups</artifactId>
         <version>${version.jgroups}</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-server-memcached</artifactId>
+        <version>${version.org.infinispan}</version>		
+        <exclusions>
+          <exclusion>
+            <groupId>org.rhq.helpers</groupId>
+            <artifactId>rhq-pluginAnnotations</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-server-hotrod</artifactId>
+        <version>${version.org.infinispan}</version>		
+        <exclusions>
+          <exclusion>
+            <groupId>org.rhq.helpers</groupId>
+            <artifactId>rhq-pluginAnnotations</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       
       <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-server-rest</artifactId>
+        <version>${version.org.infinispan}</version>
+        <type>war</type>		
+        <exclusions>
+          <exclusion>
+            <groupId>org.rhq.helpers</groupId>
+            <artifactId>rhq-pluginAnnotations</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      
+      <dependency>
         <groupId>joesnmp</groupId>
         <artifactId>joesnmp</artifactId>
         <version>0.3.4</version>

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-08 17:09:51 UTC (rev 108496)
+++ branches/JBPAPP_5_1_datagrid/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml	2010-10-08 20:07:51 UTC (rev 108497)
@@ -570,6 +570,25 @@
                <property name="fixedHostName">true</property>
                <property name="fixedPort">true</property>
             </bean>
+            
+            <!-- ******** Infinispan Tech Preview's $JBOSS_HOME/server/datagrid/deploy/datagrid.sar ******** -->
+
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <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="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="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>
+            </bean>
+
            
          </set>
          </parameter>
@@ -942,7 +961,54 @@
                      </parameter>
                   </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>        
+
             </set>
          </parameter>
       </constructor>

Modified: branches/JBPAPP_5_1_datagrid/thirdparty/pom.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/thirdparty/pom.xml	2010-10-08 17:09:51 UTC (rev 108496)
+++ branches/JBPAPP_5_1_datagrid/thirdparty/pom.xml	2010-10-08 20:07:51 UTC (rev 108497)
@@ -1933,6 +1933,19 @@
       <artifactId>jgroups</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-server-memcached</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-server-hotrod</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-server-rest</artifactId>
+      <type>war</type>
+    </dependency>
+    <dependency>
       <groupId>joesnmp</groupId>
       <artifactId>joesnmp</artifactId>
     </dependency>



More information about the jboss-cvs-commits mailing list