[jboss-cvs] JBossCache/etc ...
Manik Surtani
msurtani at jboss.com
Sat Dec 30 12:50:01 EST 2006
User: msurtani
Date: 06/12/30 12:50:01
Modified: etc tree-service.xml build.xml
jdbcCacheLoader-service.xml
Log:
Major changes to restructure cache and node object model
Revision Changes Path
1.11 +183 -184 JBossCache/etc/tree-service.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: tree-service.xml
===================================================================
RCS file: /cvsroot/jboss/JBossCache/etc/tree-service.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tree-service.xml 24 May 2006 19:56:15 -0000 1.10
+++ tree-service.xml 30 Dec 2006 17:50:01 -0000 1.11
@@ -15,7 +15,7 @@
<!-- Defines TreeCache configuration -->
<!-- ==================================================================== -->
- <mbean code="org.jboss.cache.TreeCache"
+ <mbean code="org.jboss.cache.CacheImpl"
name="jboss.cache:service=TreeCache">
<depends>jboss:service=Naming</depends>
@@ -79,7 +79,7 @@
<!-- Name of cluster. Needs to be the same for all clusters, in order
to find each other
-->
- <attribute name="ClusterName">TreeCache-Cluster</attribute>
+ <attribute name="ClusterName">JBossCache-Cluster</attribute>
<!-- JGroups protocol stack properties. Can also be a URL,
e.g. file:/home/bela/default.xml
@@ -219,5 +219,4 @@
<!-- </mbean>-->
-
</server>
1.19 +266 -265 JBossCache/etc/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/JBossCache/etc/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- build.xml 6 Dec 2006 15:46:09 -0000 1.18
+++ build.xml 30 Dec 2006 17:50:01 -0000 1.19
@@ -1,9 +1,10 @@
<?xml version="1.0"?>
-<project name="junit examples" default="help" >
+<project name="junit examples" default="help">
<property name="build.sysclasspath" value="ignore"/>
- <property name="junit.timeout" value="180000"/> <!-- 3 minutes -->
+ <property name="junit.timeout" value="180000"/>
+ <!-- 3 minutes -->
<property file="./build.properties"/>
@@ -13,24 +14,24 @@
<!-- set local properties for this build -->
<path id="lib.classpath">
<fileset dir="${lib}">
- <include name="**/*.jar" />
+ <include name="**/*.jar"/>
</fileset>
</path>
<!-- Used for aop classloading and aopc -->
<path id="aop.classpath">
<fileset dir="${lib}">
- <include name="*.jar" />
- <exclude name="jboss-cache.jar" />
- <exclude name="**/j*unit.jar" />
+ <include name="*.jar"/>
+ <exclude name="jboss-cache.jar"/>
+ <exclude name="**/j*unit.jar"/>
<!-- exclude name="**/jgroups.jar" /-->
- <exclude name="**/bsh*.jar" />
+ <exclude name="**/bsh*.jar"/>
</fileset>
</path>
<path id="cache.classpath">
<fileset dir="${lib}">
- <include name="**/jboss-cache.jar" />
+ <include name="**/jboss-cache.jar"/>
</fileset>
</path>
@@ -39,15 +40,15 @@
</path>
<target name="help" description="help page">
- <echo message="build.sh <command> where command is:" />
- <echo message=" compile -- compile the examples code" />
- <echo message=" clobber -- clean up the whole directory" />
- <echo message=" run.batch -- run batch examples" />
- <echo message=" one.test -- run one single test case. Need -Dtest=org.jboss.cache.??Test" />
- <echo message=" one.test.pojo -- run one single PojoCache test case. Need -Dtest=org.jboss.cache.pojo.??Test" />
- <echo message=" run.pojocache.batch -- run batch pojocache examples" />
- <echo message=" run.demo -- run demo gui for plain cache" />
- <echo message=" run.pojocache.demo -- run demo gui for pojocache cache" />
+ <echo message="build.sh <command> where command is:"/>
+ <echo message=" compile -- compile the examples code"/>
+ <echo message=" clobber -- clean up the whole directory"/>
+ <echo message=" run.batch -- run batch examples"/>
+ <echo message=" one.test -- run one single test case. Need -Dtest=org.jboss.cache.??Test"/>
+ <echo message=" one.test.pojo -- run one single PojoCache test case. Need -Dtest=org.jboss.cache.pojo.??Test"/>
+ <echo message=" run.pojocache.batch -- run batch pojocache examples"/>
+ <echo message=" run.demo -- run demo gui for plain cache"/>
+ <echo message=" run.pojocache.demo -- run demo gui for pojocache cache"/>
</target>
<!-- set up directory -->
@@ -55,7 +56,7 @@
<!-- Create the time stamp -->
<tstamp/>
<!-- Create the build directory structure used by compile
- and copy the deployment descriptors into it-->
+and copy the deployment descriptors into it-->
<mkdir dir="${build}"/>
<mkdir dir="${reports}"/>
</target>
@@ -64,7 +65,7 @@
<delete dir="${output}"/>
</target>
- <target name="clobber" depends="clean" />
+ <target name="clobber" depends="clean"/>
<!-- compile directory -->
<target name="compile" depends="compile-50" description="Compiles all Java files">
@@ -77,7 +78,7 @@
debug="true"
deprecation="true">
<classpath>
- <path refid="lib.classpath" />
+ <path refid="lib.classpath"/>
</classpath>
</javac>
@@ -105,13 +106,13 @@
<!-- eg. ant run.examples -Dtest=org.jboss.test.cache.test.local.NoTxUnitTestCase -->
<target name="one.test" depends="compile" description="run one junit test case.">
- <junit printsummary="true" fork="yes" >
- <classpath refid="lib.classpath" />
- <classpath path="${build}" />
- <classpath path="${output}/etc" />
- <formatter type="xml" />
+ <junit printsummary="true" fork="yes">
+ <classpath refid="lib.classpath"/>
+ <classpath path="${build}"/>
+ <classpath path="${output}/etc"/>
+ <formatter type="xml"/>
<sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
- <test name="${test}" todir="${reports}" />
+ <test name="${test}" todir="${reports}"/>
<!--
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xnoagent"/>
@@ -122,7 +123,7 @@
<junitreport todir="${reports}">
<fileset dir="${reports}">
- <include name="TEST-*.xml" />
+ <include name="TEST-*.xml"/>
</fileset>
<report format="frames" todir="${reports}/html"/>
</junitreport>
@@ -131,16 +132,16 @@
<target name="run.batch" depends="compile" description="run junit test cases.">
<junit printsummary="true"
timeout="${junit.timeout}"
- fork="yes" >
+ fork="yes">
<jvmarg value="-Xmx128M"/>
-<!--
+ <!--
<jvmarg value="-Dbind.address=172.16.129.57"/>
--->
- <classpath refid="lib.classpath" />
- <classpath path="${build}" />
- <classpath path="${output}/etc" />
+ -->
+ <classpath refid="lib.classpath"/>
+ <classpath path="${build}"/>
+ <classpath path="${output}/etc"/>
<sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
- <formatter type="xml" />
+ <formatter type="xml"/>
<batchtest todir="${reports}"
haltonerror="no"
@@ -157,78 +158,78 @@
<junitreport todir="${reports}">
<fileset dir="${reports}">
- <include name="TEST-*.xml" />
+ <include name="TEST-*.xml"/>
</fileset>
<report format="frames" todir="${reports}/html"/>
</junitreport>
</target>
- <target name="run.demo" depends="compile" description="run tree cache demo.">
+ <target name="run.demo" depends="compile" description="run JBoss Cache demo.">
<java classname="org.jboss.cache.TreeCacheView2" fork="yes">
<jvmarg value="-Xmx128M"/>
- <classpath refid="lib.classpath" />
+ <classpath refid="lib.classpath"/>
<sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
- <classpath path="${output}/etc" />
- <classpath path="${build}" />
+ <classpath path="${output}/etc"/>
+ <classpath path="${build}"/>
</java>
</target>
- <target name="run.demo.async" depends="compile" description="run tree cache demo.">
+ <target name="run.demo.async" depends="compile" description="run JBoss Cache demo.">
<java classname="org.jboss.cache.TreeCacheView2" fork="yes">
<jvmarg value="-Xmx128M"/>
<arg value="-config"/>
<arg value="META-INF/replAsync-service.xml"/>
- <classpath refid="lib.classpath" />
+ <classpath refid="lib.classpath"/>
<sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
- <classpath path="${output}/etc" />
- <classpath path="${build}" />
+ <classpath path="${output}/etc"/>
+ <classpath path="${build}"/>
</java>
</target>
- <target name="run.demo.async.shared.cacheloader" depends="compile" description="run tree cache demo.">
+ <target name="run.demo.async.shared.cacheloader" depends="compile" description="run JBoss Cache demo.">
<java classname="org.jboss.cache.TreeCacheView2" fork="yes">
<jvmarg value="-Xmx128M"/>
<arg value="-config"/>
<arg value="META-INF/replAsyncSharedCacheLoader-service.xml"/>
- <classpath refid="lib.classpath" />
+ <classpath refid="lib.classpath"/>
<sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
- <classpath path="${output}/etc" />
- <classpath path="${build}" />
+ <classpath path="${output}/etc"/>
+ <classpath path="${build}"/>
</java>
</target>
- <target name="run.demo.unshared.node1" depends="compile" description="run tree cache demo.">
+ <target name="run.demo.unshared.node1" depends="compile" description="run JBoss Cache demo.">
<java classname="org.jboss.cache.TreeCacheView2" fork="yes">
<jvmarg value="-Xmx128M"/>
<arg value="-config"/>
<arg value="META-INF/node1.xml"/>
- <classpath refid="lib.classpath" />
+ <classpath refid="lib.classpath"/>
<sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
- <classpath path="${output}/etc" />
- <classpath path="${build}" />
+ <classpath path="${output}/etc"/>
+ <classpath path="${build}"/>
</java>
</target>
- <target name="run.demo.unshared.node2" depends="compile" description="run tree cache demo.">
+ <target name="run.demo.unshared.node2" depends="compile" description="run JBoss Cache demo.">
<java classname="org.jboss.cache.TreeCacheView2" fork="yes">
<jvmarg value="-Xmx128M"/>
<arg value="-config"/>
<arg value="META-INF/node2.xml"/>
- <classpath refid="lib.classpath" />
+ <classpath refid="lib.classpath"/>
<sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
- <classpath path="${output}/etc" />
- <classpath path="${build}" />
+ <classpath path="${output}/etc"/>
+ <classpath path="${build}"/>
</java>
</target>
<target name="run.server" depends="compile" description="run standalone server replicator.">
- <java classname="org.jboss.cache.Server" fork="yes" >
- <classpath refid="lib.classpath" />
- <classpath path="${build}" />
- <classpath path="${output}/etc" />
+ <java classname="org.jboss.cache.Server" fork="yes">
+ <classpath refid="lib.classpath"/>
+ <classpath path="${build}"/>
+ <classpath path="${output}/etc"/>
</java>
</target>
@@ -277,8 +278,8 @@
<jvmarg value="-Djboss.aop.path=${output}/resources/pojocache-aop.xml"/>
<jvmarg value="-javaagent:${lib}/jboss-aop-jdk50.jar"/>
<!-- jvmarg value="-Dbind.address=${bind.address}"/ -->
- <classpath path="${output}/etc" />
- <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml" />
+ <classpath path="${output}/etc"/>
+ <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
<classpath refid="lib.classpath"/>
<classpath path="${build}"/>
<formatter type="xml" usefile="true"/>
@@ -287,7 +288,7 @@
<junitreport todir="${reports}">
<fileset dir="${reports}">
- <include name="TEST-*.xml" />
+ <include name="TEST-*.xml"/>
</fileset>
<report format="frames" todir="${reports}/html"/>
</junitreport>
@@ -299,8 +300,8 @@
<jvmarg value="-Djboss.aop.path=${output}/resources/pojocache-aop.xml"/>
<jvmarg value="-javaagent:${lib}/jboss-aop-jdk50.jar"/>
<!-- jvmarg value="-Dbind.address=${bind.address}"/ -->
- <classpath path="${output}/etc" />
- <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml" />
+ <classpath path="${output}/etc"/>
+ <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
<classpath refid="lib.classpath"/>
<classpath refid="build.classpath"/>
<formatter type="xml" usefile="true"/>
@@ -309,27 +310,27 @@
<junitreport todir="${reports}">
<fileset dir="${reports}">
- <include name="TEST-*.xml" />
+ <include name="TEST-*.xml"/>
</fileset>
<report format="frames" todir="${reports}/html"/>
</junitreport>
</target>
<target name="one.test.pojocache.aopc" depends="aopc" description="run junit test cases.">
- <junit printsummary="true" fork="yes" >
- <classpath refid="lib.classpath" />
- <classpath refid="build.classpath" />
+ <junit printsummary="true" fork="yes">
+ <classpath refid="lib.classpath"/>
+ <classpath refid="build.classpath"/>
<jvmarg value="-Djboss.aop.path=${output}/resources/pojocache-aop.xml"/>
- <classpath path="${output}/etc" />
- <formatter type="xml" />
+ <classpath path="${output}/etc"/>
+ <formatter type="xml"/>
<sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
- <test name="${test}" todir="${reports}" />
+ <test name="${test}" todir="${reports}"/>
<jvmarg value="-Xmx128M"/>
</junit>
<junitreport todir="${reports}">
<fileset dir="${reports}">
- <include name="TEST-*.xml" />
+ <include name="TEST-*.xml"/>
</fileset>
<report format="frames" todir="${reports}/html"/>
</junitreport>
@@ -340,13 +341,13 @@
<target name="run.pojocache.batch" depends="aopc" description="run junit test cases.">
<junit printsummary="true"
timeout="${junit.timeout}"
- fork="yes" >
+ fork="yes">
<jvmarg value="-Xmx128M"/>
- <classpath refid="lib.classpath" />
+ <classpath refid="lib.classpath"/>
<jvmarg value="-Djboss.aop.path=${output}/resources/pojocache-aop.xml"/>
- <classpath refid="build.classpath" />
- <classpath path="${output}/etc" />
- <formatter type="xml" />
+ <classpath refid="build.classpath"/>
+ <classpath path="${output}/etc"/>
+ <formatter type="xml"/>
<sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
<batchtest todir="${reports}"
@@ -363,38 +364,38 @@
<junitreport todir="${reports}">
<fileset dir="${reports}">
- <include name="TEST-*.xml" />
+ <include name="TEST-*.xml"/>
</fileset>
<report format="frames" todir="${reports}/html"/>
</junitreport>
</target>
- <target name="run.pojocache.demo" depends="compile" description="run tree cache demo.">
+ <target name="run.pojocache.demo" depends="compile" description="run JBoss Cache demo.">
<!--java classname="org.jboss.cache.aop.TreeCacheAopView" fork="yes"-->
<java classname="org.jboss.cache.TreeCacheView2" fork="yes">
<jvmarg value="-Xmx128M"/>
-<!--
+ <!--
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xnoagent"/>
<jvmarg value="-Djava.compiler=NONE"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=2401"/>
--->
+ -->
- <classpath refid="lib.classpath" />
+ <classpath refid="lib.classpath"/>
<sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/>
- <classpath path="${output}/etc" />
- <classpath path="${build}" />
+ <classpath path="${output}/etc"/>
+ <classpath path="${build}"/>
</java>
</target>
<!-- Works only with aop package -->
<!-- This one uses the system classloader option -->
<target name="run.aop.server" depends="compile" description="run standalone server replicator.">
- <java classname="org.jboss.cache.aop.Server" fork="yes" >
+ <java classname="org.jboss.cache.aop.Server" fork="yes">
<jvmarg value="-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader"/>
- <classpath refid="lib.classpath" />
- <classpath path="${build}" />
- <classpath path="${output}/etc" />
+ <classpath refid="lib.classpath"/>
+ <classpath path="${build}"/>
+ <classpath path="${output}/etc"/>
</java>
</target>
1.11 +182 -183 JBossCache/etc/jdbcCacheLoader-service.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: jdbcCacheLoader-service.xml
===================================================================
RCS file: /cvsroot/jboss/JBossCache/etc/jdbcCacheLoader-service.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- jdbcCacheLoader-service.xml 30 May 2006 18:40:24 -0000 1.10
+++ jdbcCacheLoader-service.xml 30 Dec 2006 17:50:01 -0000 1.11
@@ -15,7 +15,7 @@
<!-- Defines TreeCache configuration -->
<!-- ==================================================================== -->
- <mbean code="org.jboss.cache.TreeCache"
+ <mbean code="org.jboss.cache.CacheImpl"
name="jboss.cache:service=TreeCache">
<depends>jboss:service=Naming</depends>
@@ -66,7 +66,7 @@
<!-- Name of cluster. Needs to be the same for all clusters, in order
to find each other
-->
- <attribute name="ClusterName">TreeCache-Cluster</attribute>
+ <attribute name="ClusterName">JBossCache-Cluster</attribute>
<!-- JGroups protocol stack properties. Can also be a URL,
e.g. file:/home/bela/default.xml
@@ -127,7 +127,7 @@
<attribute name="EvictionPolicyClass"></attribute>
-<!-- Old 1.2.x cache loader config block
+ <!-- Old 1.2.x cache loader config block
<attribute name="CacheLoaderClass">org.jboss.cache.loader.JDBCCacheLoader</attribute>
<attribute name="CacheLoaderShared">false</attribute>
@@ -150,7 +150,7 @@
</attribute>
<attribute name="CacheLoaderPassivation">false</attribute>
--->
+ -->
<!-- Cache Passivation for Tree Cache
On pasivation, The objects are written to the backend store on eviction if CacheLoaderPassivation
@@ -210,5 +210,4 @@
<!-- </mbean>-->
-
</server>
More information about the jboss-cvs-commits
mailing list