[jbosscache-commits] JBoss Cache SVN: r6060 - in core/trunk: src/main and 6 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Thu Jun 26 12:40:07 EDT 2008
Author: mircea.markus
Date: 2008-06-26 12:40:06 -0400 (Thu, 26 Jun 2008)
New Revision: 6060
Added:
core/trunk/src/main/resources/
core/trunk/src/main/resources/META-INF/
core/trunk/src/main/resources/cache-config.xml
core/trunk/src/main/resources/cache-jdbc.properties
core/trunk/src/main/resources/config2to3.xslt
core/trunk/src/main/resources/dependencies.xml
core/trunk/src/main/resources/jndi.properties
Removed:
core/trunk/src/main/etc/
core/trunk/src/main/resources/META-INF/
core/trunk/src/main/resources/cache-config.xml
core/trunk/src/main/resources/cache-jdbc.properties
core/trunk/src/main/resources/dependencies.xml
core/trunk/src/main/resources/jndi.properties
Modified:
core/trunk/assembly/all.xml
core/trunk/assembly/bin.xml
core/trunk/src/main/docbook/faq/en/master.xml
core/trunk/src/main/docbook/tutorial/en/master.xml
core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml
core/trunk/src/main/release/build.xml
core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTransformerTest.java
Log:
renamed etc to resources
Modified: core/trunk/assembly/all.xml
===================================================================
--- core/trunk/assembly/all.xml 2008-06-26 16:32:57 UTC (rev 6059)
+++ core/trunk/assembly/all.xml 2008-06-26 16:40:06 UTC (rev 6060)
@@ -23,8 +23,8 @@
<!-- resources -->
<fileSet>
- <directory>src/main/etc</directory>
- <outputDirectory>etc</outputDirectory>
+ <directory>src/main/resources</directory>
+ <outputDirectory>resources</outputDirectory>
</fileSet>
<!-- srcs -->
Modified: core/trunk/assembly/bin.xml
===================================================================
--- core/trunk/assembly/bin.xml 2008-06-26 16:32:57 UTC (rev 6059)
+++ core/trunk/assembly/bin.xml 2008-06-26 16:40:06 UTC (rev 6060)
@@ -22,8 +22,8 @@
<!-- resources -->
<fileSet>
- <directory>src/main/etc</directory>
- <outputDirectory>etc</outputDirectory>
+ <directory>src/main/resources</directory>
+ <outputDirectory>resources</outputDirectory>
</fileSet>
<!-- EULAs and license files -->
Modified: core/trunk/src/main/docbook/faq/en/master.xml
===================================================================
--- core/trunk/src/main/docbook/faq/en/master.xml 2008-06-26 16:32:57 UTC (rev 6059)
+++ core/trunk/src/main/docbook/faq/en/master.xml 2008-06-26 16:40:06 UTC (rev 6060)
@@ -313,7 +313,7 @@
<literal>all</literal>
configuration whereby the
necessary jars are present). Under the standalone package
- <literal>etc/META-INF</literal>
+ <literal>resources/META-INF</literal>
directory , there are example
configuration files for different cache modes that can be used to
deploy JBoss Cache as well.
Modified: core/trunk/src/main/docbook/tutorial/en/master.xml
===================================================================
--- core/trunk/src/main/docbook/tutorial/en/master.xml 2008-06-26 16:32:57 UTC (rev 6059)
+++ core/trunk/src/main/docbook/tutorial/en/master.xml 2008-06-26 16:40:06 UTC (rev 6060)
@@ -77,7 +77,7 @@
</para>
<para>The configuration files are located in the
- <literal>JBossCache/etc</literal>
+ <literal>JBossCache/resources</literal>
directory. You can
modify the behavior of the cache by editing the various configuration files.
</para>
Modified: core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml
===================================================================
--- core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml 2008-06-26 16:32:57 UTC (rev 6059)
+++ core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml 2008-06-26 16:40:06 UTC (rev 6060)
@@ -253,7 +253,7 @@
<literal>MultiplexerStack</literal>
are used.
See the various *-service.xml files in the source distribution
- <literal>etc/META-INF</literal>
+ <literal>resources/META-INF</literal>
folder for examples.
See the
<ulink url="http://www.jgroups.org">JGroups documentation</ulink>
Modified: core/trunk/src/main/release/build.xml
===================================================================
--- core/trunk/src/main/release/build.xml 2008-06-26 16:32:57 UTC (rev 6059)
+++ core/trunk/src/main/release/build.xml 2008-06-26 16:40:06 UTC (rev 6060)
@@ -12,7 +12,7 @@
<property name="output" value="${basedir}/output"/>
<property name="build" value="${output}/classes"/>
<property name="lib" value="${basedir}/lib"/>
- <property name="etc" value="${basedir}/etc"/>
+ <property name="resources" value="${basedir}/resources"/>
<property name="reports" value="${output}/reports"/>
<!-- JVM args for when running tests -->
@@ -49,7 +49,7 @@
<path refid="build.classpath"/>
<path refid="cache.classpath"/>
<path refid="lib.classpath"/>
- <pathelement path="${etc}"/>
+ <pathelement path="${resources}"/>
<!-- this needs to be in the test classpath as well since it contains test configuration XML files -->
<pathelement path="${source}"/>
</path>
@@ -103,7 +103,7 @@
</javac>
<copy todir="${output}/etc">
- <fileset dir="${etc}">
+ <fileset dir="${resources}">
<include name="**/*"/>
</fileset>
</copy>
Copied: core/trunk/src/main/resources (from rev 6057, core/trunk/src/main/etc)
Copied: core/trunk/src/main/resources/META-INF (from rev 6059, core/trunk/src/main/etc/META-INF)
Deleted: core/trunk/src/main/resources/cache-config.xml
===================================================================
--- core/trunk/src/main/etc/cache-config.xml 2008-06-26 14:57:18 UTC (rev 6057)
+++ core/trunk/src/main/resources/cache-config.xml 2008-06-26 16:40:06 UTC (rev 6060)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
- <mbean code="org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper"
- name="jboss.cache:service=LabconnTreeCacheAop">
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
- </attribute>
- <attribute name="IsolationLevel">READ_COMMITTED</attribute>
-
- <attribute name="CacheMode">LOCAL</attribute>
-
- <attribute name="CacheLoaderConfig" replace="false">
- <config>
- <cacheloader>
- <class>org.jboss.cache.loader.bdbje.BdbjeCacheLoader</class>
- <properties>
- location=./
- </properties>
- </cacheloader>
- </config>
- </attribute>
- </mbean>
-</server>
Copied: core/trunk/src/main/resources/cache-config.xml (from rev 6059, core/trunk/src/main/etc/cache-config.xml)
===================================================================
--- core/trunk/src/main/resources/cache-config.xml (rev 0)
+++ core/trunk/src/main/resources/cache-config.xml 2008-06-26 16:40:06 UTC (rev 6060)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+ <mbean code="org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper"
+ name="jboss.cache:service=LabconnTreeCacheAop">
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+ <attribute name="IsolationLevel">READ_COMMITTED</attribute>
+
+ <attribute name="CacheMode">LOCAL</attribute>
+
+ <attribute name="CacheLoaderConfig" replace="false">
+ <config>
+ <cacheloader>
+ <class>org.jboss.cache.loader.bdbje.BdbjeCacheLoader</class>
+ <properties>
+ location=./
+ </properties>
+ </cacheloader>
+ </config>
+ </attribute>
+ </mbean>
+</server>
Deleted: core/trunk/src/main/resources/cache-jdbc.properties
===================================================================
--- core/trunk/src/main/etc/cache-jdbc.properties 2008-06-26 14:57:18 UTC (rev 6057)
+++ core/trunk/src/main/resources/cache-jdbc.properties 2008-06-26 16:40:06 UTC (rev 6060)
@@ -1,69 +0,0 @@
-##
-# Standard JBC table properties
-# The table name can also be prepended with schema name for the given table.
-# Even though there is an Sql92 standard syntax for this: <schema_name>.<table name>
-#schema has different meanings accross various DBMS: Oracle - user name; PointBase - database name
-# Microsoft SQL Server & DB2 - schema name corresponds to the catalog owner
-cache.jdbc.table.name=jbosscache
-cache.jdbc.table.create=true
-cache.jdbc.table.drop=false
-cache.jdbc.table.primarykey=jbosscache_pk
-cache.jdbc.fqn.column=fqn
-cache.jdbc.fqn.type=varchar(255)
-cache.jdbc.node.column=node
-cache.jdbc.node.type=blob
-cache.jdbc.parent.column=parent
-# Specify your DBMS's string concatenation function syntax in the following manner: concat(1 , 2) -> '12'.
-# This syntax should work an most popular DBMS like oracle, db2, mssql, mysql, PostgreSQL. Derby - on which
-#the tests are run does not support 'concat', but '1 || 2' . If no value is sepcified then concat(1 , 2) is used by default.
-cache.jdbc.sql-concat=1 || 2
-
-# JBoss Cache Table properties for Hypersonic, just overrides
-#cache.jdbc.node.type=OBJECT
-
-##
-# DataSource
-#cache.jdbc.datasource=DefaultDS
-
-##
-# JDBC driver specific properties
-
-# Hypersonic
-#cache.jdbc.node.type=OBJECT
-
-## MySql
-#cache.jdbc.driver=com.mysql.jdbc.Driver
-#cache.jdbc.url=jdbc:mysql://localhost:3306/jbossdb
-#cache.jdbc.user=root
-#cache.jdbc.password=admin
-
-## Oracle
-#cache.jdbc.driver=oracle.jdbc.OracleDriver
-#cache.jdbc.url=jdbc:oracle:thin:@192.168.0.100:1521:JBOSSDB
-#cache.jdbc.user=jboss
-#cache.jdbc.password=sa
-
-## MS Sql Server
-#cache.jdbc.driver=com.microsoft.jdbc.sqlserver.SQLServerDriver
-#cache.jdbc.url=jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=jbossdb;SelectMethod=cursor
-#cache.jdbc.user=sa
-#cache.jdbc.password=
-#cache.jdbc.node.type=image
-
-## Pointbase
-#cache.jdbc.driver=com.pointbase.jdbc.jdbcUniversalDriver
-#cache.jdbc.url=jdbc:pointbase:server://localhost:9092/jboss,new
-#cache.jdbc.user=PBPUBLIC
-#cache.jdbc.password=PBPUBLIC
-
-## PostgreSQL
-#cache.jdbc.driver = org.postgresql.Driver
-#cache.jdbc.url=jdbc:postgresql://192.168.0.100:5432/jbossdb
-#cache.jdbc.user=postgres
-#cache.jdbc.password=admin
-
-## Derby
-cache.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver
-cache.jdbc.url=jdbc:derby:jbossdb;create=true
-cache.jdbc.user=user1
-cache.jdbc.password=user1
\ No newline at end of file
Copied: core/trunk/src/main/resources/cache-jdbc.properties (from rev 6059, core/trunk/src/main/etc/cache-jdbc.properties)
===================================================================
--- core/trunk/src/main/resources/cache-jdbc.properties (rev 0)
+++ core/trunk/src/main/resources/cache-jdbc.properties 2008-06-26 16:40:06 UTC (rev 6060)
@@ -0,0 +1,69 @@
+##
+# Standard JBC table properties
+# The table name can also be prepended with schema name for the given table.
+# Even though there is an Sql92 standard syntax for this: <schema_name>.<table name>
+#schema has different meanings accross various DBMS: Oracle - user name; PointBase - database name
+# Microsoft SQL Server & DB2 - schema name corresponds to the catalog owner
+cache.jdbc.table.name=jbosscache
+cache.jdbc.table.create=true
+cache.jdbc.table.drop=false
+cache.jdbc.table.primarykey=jbosscache_pk
+cache.jdbc.fqn.column=fqn
+cache.jdbc.fqn.type=varchar(255)
+cache.jdbc.node.column=node
+cache.jdbc.node.type=blob
+cache.jdbc.parent.column=parent
+# Specify your DBMS's string concatenation function syntax in the following manner: concat(1 , 2) -> '12'.
+# This syntax should work an most popular DBMS like oracle, db2, mssql, mysql, PostgreSQL. Derby - on which
+#the tests are run does not support 'concat', but '1 || 2' . If no value is sepcified then concat(1 , 2) is used by default.
+cache.jdbc.sql-concat=1 || 2
+
+# JBoss Cache Table properties for Hypersonic, just overrides
+#cache.jdbc.node.type=OBJECT
+
+##
+# DataSource
+#cache.jdbc.datasource=DefaultDS
+
+##
+# JDBC driver specific properties
+
+# Hypersonic
+#cache.jdbc.node.type=OBJECT
+
+## MySql
+#cache.jdbc.driver=com.mysql.jdbc.Driver
+#cache.jdbc.url=jdbc:mysql://localhost:3306/jbossdb
+#cache.jdbc.user=root
+#cache.jdbc.password=admin
+
+## Oracle
+#cache.jdbc.driver=oracle.jdbc.OracleDriver
+#cache.jdbc.url=jdbc:oracle:thin:@192.168.0.100:1521:JBOSSDB
+#cache.jdbc.user=jboss
+#cache.jdbc.password=sa
+
+## MS Sql Server
+#cache.jdbc.driver=com.microsoft.jdbc.sqlserver.SQLServerDriver
+#cache.jdbc.url=jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=jbossdb;SelectMethod=cursor
+#cache.jdbc.user=sa
+#cache.jdbc.password=
+#cache.jdbc.node.type=image
+
+## Pointbase
+#cache.jdbc.driver=com.pointbase.jdbc.jdbcUniversalDriver
+#cache.jdbc.url=jdbc:pointbase:server://localhost:9092/jboss,new
+#cache.jdbc.user=PBPUBLIC
+#cache.jdbc.password=PBPUBLIC
+
+## PostgreSQL
+#cache.jdbc.driver = org.postgresql.Driver
+#cache.jdbc.url=jdbc:postgresql://192.168.0.100:5432/jbossdb
+#cache.jdbc.user=postgres
+#cache.jdbc.password=admin
+
+## Derby
+cache.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver
+cache.jdbc.url=jdbc:derby:jbossdb;create=true
+cache.jdbc.user=user1
+cache.jdbc.password=user1
\ No newline at end of file
Added: core/trunk/src/main/resources/config2to3.xslt
===================================================================
--- core/trunk/src/main/resources/config2to3.xslt (rev 0)
+++ core/trunk/src/main/resources/config2to3.xslt 2008-06-26 16:40:06 UTC (rev 6060)
@@ -0,0 +1,425 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="/">
+ <xsl:element name="jbosscache">
+ <xsl:call-template name="locking"/>
+ <xsl:call-template name="transaction"/>
+ <xsl:call-template name="serialization"/>
+ <xsl:call-template name="startup"/>
+ <xsl:call-template name="transport"/>
+ <xsl:apply-templates select="//attribute"/>
+ <!--<xsl:call-template name="invalidation"/> -->
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="//attribute"/>
+
+ <xsl:template name="locking">
+ <xsl:if
+ test="//attribute[@name='IsolationLevel'] | //attribute[@name='LockAcquisitionTimeout'] | //attribute[@name='LockParentForChildInsertRemove']">
+ <xsl:element name="locking">
+ <xsl:if test="//attribute[@name='IsolationLevel']">
+ <xsl:attribute name="isolationLevel">
+ <xsl:value-of select="normalize-space(//attribute[@name='IsolationLevel'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='LockAcquisitionTimeout']">
+ <xsl:attribute name="lockAcquisitionTimeout">
+ <xsl:value-of select="normalize-space(//attribute[@name='LockAcquisitionTimeout'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='LockParentForChildInsertRemove']">
+ <xsl:attribute name="lockParentForChildInsertRemove">
+ <xsl:value-of select="normalize-space(//attribute[@name='LockParentForChildInsertRemove'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='NodeLockingScheme']">
+ <xsl:attribute name="optimistic">
+ <xsl:value-of select="normalize-space(//attribute[@name='NodeLockingScheme'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ </xsl:element>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template name="transaction">
+ <xsl:if
+ test="//attribute[@name='TransactionManagerLookupClass'] | //attribute[@name='SyncRollbackPhase'] | //attribute[@name='SyncCommitPhase']">
+ <xsl:element name="transaction">
+ <xsl:if test="//attribute[@name='TransactionManagerLookupClass']">
+ <xsl:attribute name="transactionManagerLookupClass">
+ <xsl:value-of select="normalize-space(//attribute[@name='TransactionManagerLookupClass'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='SyncCommitPhase']">
+ <xsl:attribute name="syncCommitPhase">
+ <xsl:value-of select="normalize-space(//attribute[@name='SyncCommitPhase'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='SyncRollbackPhase']">
+ <xsl:attribute name="syncRollbackPhase">
+ <xsl:value-of select="normalize-space(//attribute[@name='SyncRollbackPhase'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ </xsl:element>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template name="serialization">
+ <xsl:if
+ test="//attribute[@name='ObjectInputStreamPoolSize'] | //attribute[@name='ObjectOutputStreamPoolSize'] | //attribute[@name='ReplicationVersion'] | //attribute[@name='MarshallerClass'] | //attribute[@name='UseLazyDeserialization'] | //attribute[@name='UseRegionBasedMarshalling']">
+ <serialization>
+ <xsl:if test="//attribute[@name='ObjectInputStreamPoolSize']">
+ <xsl:attribute name="objectInputStreamPoolSize">
+ <xsl:value-of select="normalize-space(//attribute[@name='ObjectInputStreamPoolSize'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='ObjectOutputStreamPoolSize']">
+ <xsl:attribute name="objectOutputStreamPoolSize">
+ <xsl:value-of select="normalize-space(//attribute[@name='ObjectOutputStreamPoolSize'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='ReplicationVersion']">
+ <xsl:attribute name="version">
+ <xsl:value-of select="normalize-space(//attribute[@name='ReplicationVersion'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='MarshallerClass']">
+ <xsl:attribute name="marshallerClass">
+ <xsl:value-of select="normalize-space(//attribute[@name='MarshallerClass'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='UseLazyDeserialization']">
+ <xsl:attribute name="useLazyDeserialization">
+ <xsl:value-of select="normalize-space(//attribute[@name='UseLazyDeserialization'])"/>
+ </xsl:attribute>
+ </xsl:if>
+
+ <xsl:if test="//attribute[@name='UseRegionBasedMarshalling']">
+ <xsl:attribute name="useRegionBasedMarshalling">
+ <xsl:value-of select="normalize-space(//attribute[@name='UseRegionBasedMarshalling'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ </serialization>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template match="//attribute[@name='CacheMode']">
+ <xsl:if test="(normalize-space(.) = 'INVALIDATION_ASYNC') or (normalize-space(.) = 'INVALIDATION_SYNC')">
+ <invalidation>
+ <xsl:if test="(normalize-space(.) = 'INVALIDATION_ASYNC')">
+ <xsl:element name="async">
+ <xsl:call-template name="asyncAttributes"/>
+ </xsl:element>
+ </xsl:if>
+ <xsl:if test="(normalize-space(.) = 'INVALIDATION_SYNC')">
+ <xsl:element name="sync">
+ <xsl:call-template name="syncAttributes"/>
+ </xsl:element>
+ </xsl:if>
+ </invalidation>
+ </xsl:if>
+ <xsl:if test="(normalize-space(.) = 'REPL_ASYNC') or (normalize-space(.) = 'REPL_SYNC')">
+ <replication>
+ <xsl:if test="(normalize-space(.) = 'REPL_ASYNC')">
+ <xsl:element name="async">
+ <xsl:call-template name="asyncAttributes"/>
+ </xsl:element>
+ </xsl:if>
+ <xsl:if test="(normalize-space(.) = 'REPL_SYNC')">
+ <xsl:element name="sync">
+ <xsl:call-template name="syncAttributes"/>
+ </xsl:element>
+ </xsl:if>
+ <xsl:call-template name="buddy"/>
+ </replication>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template name="buddy">
+ <xsl:if test="//attribute[@name='BuddyReplicationConfig']">
+ <buddy>
+ <xsl:if test="//buddyReplicationEnabled">
+ <xsl:attribute name="enabled">
+ <xsl:value-of select="//buddyReplicationEnabled"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//buddyPoolName">
+ <xsl:attribute name="poolName">
+ <xsl:value-of select="//buddyPoolName"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//buddyCommunicationTimeout">
+ <xsl:attribute name="communicationTimeout">
+ <xsl:value-of select="//buddyCommunicationTimeout"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//autoDataGravitation | //dataGravitationRemoveOnFind | //dataGravitationSearchBackupTrees">
+ <dataGravitation>
+ <xsl:if test="//autoDataGravitation">
+ <xsl:attribute name="auto">
+ <xsl:value-of select="//autoDataGravitation"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//dataGravitationRemoveOnFind">
+ <xsl:attribute name="removeOnFind">
+ <xsl:value-of select="//dataGravitationRemoveOnFind"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//dataGravitationSearchBackupTrees">
+ <xsl:attribute name="searchBackupTrees">
+ <xsl:value-of select="//dataGravitationSearchBackupTrees"/>
+ </xsl:attribute>
+ </xsl:if>
+ </dataGravitation>
+ </xsl:if>
+ <xsl:if test="//buddyLocatorProperties">
+ <locator>
+ <xsl:if test="//buddyLocatorClass">
+ <xsl:attribute name="class">
+ <xsl:value-of select="//buddyLocatorClass"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//buddyLocatorProperties">
+ <properties>
+ <xsl:value-of select="//buddyLocatorProperties"/>
+ </properties>
+ </xsl:if>
+ </locator>
+ </xsl:if>
+ </buddy>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template name="asyncAttributes">
+ <xsl:if test="//attribute[@name='UseReplQueue']">
+ <xsl:attribute name="useReplQueue">
+ <xsl:value-of select="//attribute[@name='UseReplQueue']"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='ReplQueueInterval']">
+ <xsl:attribute name="replQueueInterval">
+ <xsl:value-of select="//attribute[@name='ReplQueueInterval']"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='ReplQueueMaxElements']">
+ <xsl:attribute name="replQueueMaxElements">
+ <xsl:value-of select="//attribute[@name='ReplQueueMaxElements']"/>
+ </xsl:attribute>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template name="syncAttributes">
+ <xsl:if test="//attribute[@name='SyncReplTimeout']">
+ <xsl:attribute name="replTimeout">
+ <xsl:value-of select="//attribute[@name='SyncReplTimeout']"/>
+ </xsl:attribute>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template name="startup">
+ <xsl:if
+ test="//attribute[@name='FetchInMemoryState'] | //attribute[@name='StateRetrievalTimeout'] | //attribute[@name='InactiveOnStartup']">
+ <xsl:element name="startup">
+ <xsl:if test="//attribute[@name='FetchInMemoryState']">
+ <xsl:attribute name="fetchInMemoryState">
+ <xsl:value-of select="normalize-space(//attribute[@name='FetchInMemoryState'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='StateRetrievalTimeout']">
+ <xsl:attribute name="stateRetrievalTimeout">
+ <xsl:value-of select="normalize-space(//attribute[@name='StateRetrievalTimeout'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='InactiveOnStartup']">
+ <xsl:attribute name="inactiveOnStartup">
+ <xsl:value-of select="normalize-space(//attribute[@name='InactiveOnStartup'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ </xsl:element>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template match="//attribute[@name='ShutdownHookBehavior']">
+ <shutdown>
+ <xsl:attribute name="hookBehavior">
+ <xsl:value-of select="normalize-space(.)"/>
+ </xsl:attribute>
+ </shutdown>
+ </xsl:template>
+
+ <xsl:template match="//attribute[@name='ExposeManagementStatistics']">
+ <jmxStatistics>
+ <xsl:attribute name="enabled">
+ <xsl:value-of select="normalize-space(.)"/>
+ </xsl:attribute>
+ </jmxStatistics>
+ </xsl:template>
+
+ <xsl:template match="//attribute[@name='EvictionPolicyConfig']">
+ <eviction>
+ <xsl:if test="./config/attribute[@name='wakeUpIntervalSeconds']">
+ <xsl:attribute name="wakeUpInterval">
+ <xsl:value-of select="concat(normalize-space(./config/attribute[@name='wakeUpIntervalSeconds']), '000')"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="./config/attribute[@name='policyClass'] | ./config/attribute[@name='policyClass']">
+ <defaults>
+ <xsl:if test="./config/attribute[@name='policyClass']">
+ <xsl:attribute name="policyClass">
+ <xsl:value-of select="normalize-space(./config/attribute[@name='policyClass'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="./config/attribute[@name='eventQueueSize']">
+ <xsl:attribute name="eventQueueSize">
+ <xsl:value-of select="normalize-space(./config/attribute[@name='eventQueueSize'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ </defaults>
+ </xsl:if>
+ <xsl:if test="./config/region[@name='/_default_']">
+ <root>
+ <xsl:copy-of select="./config/region[@name='/_default_']/*"/>
+ </root>
+ </xsl:if>
+ <xsl:for-each select="./config/region[@name!='/_default_']">
+ <region>
+ <xsl:if test="@name">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@name"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:copy-of select="./*"/>
+ </region>
+ </xsl:for-each>
+ </eviction>
+ </xsl:template>
+
+ <xsl:template match="//attribute[@name='CacheLoaderConfiguration']">
+ <loaders>
+ <xsl:if test="./config/passivation">
+ <xsl:attribute name="passivation">
+ <xsl:value-of select="./config/passivation"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="./config/shared">
+ <xsl:attribute name="shared">
+ <xsl:value-of select="./config/shared"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="./config/preload">
+ <preload>
+ <xsl:call-template name="preloadTokenizer">
+ <xsl:with-param name="string" select="./config/preload"/>
+ <xsl:with-param name="delimiter" select="','"/>
+ </xsl:call-template>
+ </preload>
+ </xsl:if>
+ <xsl:for-each select="./config/cacheloader">
+ <loader>
+ <xsl:if test="./class">
+ <xsl:attribute name="class">
+ <xsl:value-of select="./class"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="./async">
+ <xsl:attribute name="async">
+ <xsl:value-of select="./async"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="./fetchPersistentState">
+ <xsl:attribute name="fetchPersistentState">
+ <xsl:value-of select="./fetchPersistentState"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="./ignoreModifications">
+ <xsl:attribute name="ignoreModifications">
+ <xsl:value-of select="./ignoreModifications"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="./purgeOnStartup">
+ <xsl:attribute name="purgeOnStartup">
+ <xsl:value-of select="./purgeOnStartup"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="./properties">
+ <xsl:copy-of select="./properties"/>
+ </xsl:if>
+ <xsl:if test="./singletonStore">
+ <singletonStore>
+ <xsl:if test="./singletonStore/enabled">
+ <xsl:attribute name="enabled">
+ <xsl:value-of select="./singletonStore/enabled"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="./singletonStore/enabled">
+ <xsl:attribute name="enabled">
+ <xsl:value-of select="./singletonStore/enabled"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="./singletonStore/class">
+ <xsl:attribute name="class">
+ <xsl:value-of select="./singletonStore/class"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:copy-of select="./singletonStore/properties"/>
+ </singletonStore>
+ </xsl:if>
+ </loader>
+ </xsl:for-each>
+ </loaders>
+ </xsl:template>
+
+ <xsl:template name="preloadTokenizer">
+ <xsl:param name="string"/>
+ <xsl:param name="delimiter" select="' '"/>
+ <xsl:choose>
+ <xsl:when test="$delimiter and contains($string, $delimiter)">
+ <node>
+ <xsl:attribute name="fqn">
+ <xsl:value-of select="substring-before($string,$delimiter)"/>
+ </xsl:attribute>
+ </node>
+ <xsl:call-template name="preloadTokenizer">
+ <xsl:with-param name="string" select="substring-after($string,$delimiter)"/>
+ <xsl:with-param name="delimiter" select="$delimiter"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <node>
+ <xsl:attribute name="fqn">
+ <xsl:value-of select="$string"/>
+ </xsl:attribute>
+ </node>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+
+ <xsl:template name="transport">
+ <xsl:if
+ test="//attribute[@name='ClusterName'] | //attribute[@name='MultiplexerStack'] | //attribute[@name='ClusterConfig']">
+ <transport>
+ <xsl:if test="//attribute[@name='ClusterName']">
+ <xsl:attribute name="clusterName">
+ <xsl:value-of select="normalize-space(//attribute[@name='ClusterName'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='MultiplexerStack']">
+ <xsl:attribute name="multiplexerStack">
+ <xsl:value-of select="normalize-space(//attribute[@name='MultiplexerStack'])"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="//attribute[@name='ClusterConfig']">
+ <jgroupsConfig>
+ <xsl:copy-of select="//attribute[@name='ClusterConfig']/config/*"/>
+ </jgroupsConfig>
+ </xsl:if>
+ </transport>
+ </xsl:if>
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
Deleted: core/trunk/src/main/resources/dependencies.xml
===================================================================
--- core/trunk/src/main/etc/dependencies.xml 2008-06-26 14:57:18 UTC (rev 6057)
+++ core/trunk/src/main/resources/dependencies.xml 2008-06-26 16:40:06 UTC (rev 6060)
@@ -1,114 +0,0 @@
-<!--
-Describes the version(s) of the libraries JBossCache depends on
-Author: Bela Ban
-Version: $Id$
- -->
-
-<dependencies>
- <jdk>1.4</jdk>
-
- <lib name="beanshell">
- <jar>bsh-2.0b4.jar</jar>
- <version>1.3.0</version>
- <version>2.0b4</version>
- <description>Embeddable Java source interpreter. Used in distribution demo. </description>
- </lib>
-
- <lib name="commons-logging">
- <jar>commons-logging.jar</jar>
- <version>1.0.3</version>
- <description>Apache commons logging. Used in logging now.</description>
- </lib>
-
- <lib name="concurrent">
- <jar>concurrent.jar</jar>
- <version>1.3.4</version>
- <description>Doug Lea's concurrent package.</description>
- </lib>
-
- <lib name="javassist">
- <jar>javassist.jar</jar>
- <version>3.1RC2</version>
- <description>Simple Java bytecode manipulation. Used by Aop.</description>
- </lib>
-
- <lib name="qdox">
- <jar>qdox.jar</jar>
- <version>1.4</version>
- <description>Parser for annotation used in Aop.</description>
- </lib>
-
- <lib name="jboss-aop">
- <jar>jboss-aop.jar</jar>
- <version>1.3.5</version>
- <description>Standalone JBoss Aop.</description>
- </lib>
-
- <lib name="jboss-aop-15">
- <jar>jboss-aop-jdk50.jar</jar>
- <version>1.3.5</version>
- <description>Standalone JBoss Aop for JDK50.</description>
- </lib>
-
- <lib name="jboss-common">
- <jar>jboss-common.jar</jar>
- <version>4.0.3</version>
- <description>JBoss common classes</description>
- </lib>
-
- <lib name="jboss-j2ee">
- <jar>jboss-j2ee.jar</jar>
- <version>4.0.3</version>
- <description>j2ee interfaces</description>
- </lib>
-
- <lib name="jboss-jmx">
- <jar>jboss-jmx.jar</jar>
- <version>4.0.3</version>
- <description>jmx implementaiton</description>
- </lib>
-
- <lib name="jboss-minimal">
- <jar>jboss-minimal.jar</jar>
- <version>4.0.3</version>
- <description></description>
- </lib>
-
- <lib name="jboss-system">
- <jar>jboss-system.jar</jar>
- <version>4.0.3</version>
- <description></description>
- </lib>
-
- <lib name="jgroups">
- <jar>jgroups.jar</jar>
- <version>2.2.7</version>
- <version>2.2.8</version>
- <description>Reliable messaging library. Used in replication.</description>
- </lib>
-
- <lib name="junit">
- <jar>junit.jar</jar>
- <version>3.8.1</version>
- <description>Unit testing framework. Used for examples.</description>
- </lib>
-
- <lib name="sleepycat">
- <jar>sleepycat/je.jar</jar>
- <version>1.7.0</version>
- <version>2.0.54</version>
- <description>Embeded DB. Used for JE cache loader.</description>
- </lib>
-
- <lib name="trove">
- <jar>trove.jar</jar>
- <version>1.0.2</version>
- <description>High performance collections for Java. Used by Aop.</description>
- </lib>
-
-</dependencies>
-
-
-
-
-
Copied: core/trunk/src/main/resources/dependencies.xml (from rev 6059, core/trunk/src/main/etc/dependencies.xml)
===================================================================
--- core/trunk/src/main/resources/dependencies.xml (rev 0)
+++ core/trunk/src/main/resources/dependencies.xml 2008-06-26 16:40:06 UTC (rev 6060)
@@ -0,0 +1,114 @@
+<!--
+Describes the version(s) of the libraries JBossCache depends on
+Author: Bela Ban
+Version: $Id$
+ -->
+
+<dependencies>
+ <jdk>1.4</jdk>
+
+ <lib name="beanshell">
+ <jar>bsh-2.0b4.jar</jar>
+ <version>1.3.0</version>
+ <version>2.0b4</version>
+ <description>Embeddable Java source interpreter. Used in distribution demo. </description>
+ </lib>
+
+ <lib name="commons-logging">
+ <jar>commons-logging.jar</jar>
+ <version>1.0.3</version>
+ <description>Apache commons logging. Used in logging now.</description>
+ </lib>
+
+ <lib name="concurrent">
+ <jar>concurrent.jar</jar>
+ <version>1.3.4</version>
+ <description>Doug Lea's concurrent package.</description>
+ </lib>
+
+ <lib name="javassist">
+ <jar>javassist.jar</jar>
+ <version>3.1RC2</version>
+ <description>Simple Java bytecode manipulation. Used by Aop.</description>
+ </lib>
+
+ <lib name="qdox">
+ <jar>qdox.jar</jar>
+ <version>1.4</version>
+ <description>Parser for annotation used in Aop.</description>
+ </lib>
+
+ <lib name="jboss-aop">
+ <jar>jboss-aop.jar</jar>
+ <version>1.3.5</version>
+ <description>Standalone JBoss Aop.</description>
+ </lib>
+
+ <lib name="jboss-aop-15">
+ <jar>jboss-aop-jdk50.jar</jar>
+ <version>1.3.5</version>
+ <description>Standalone JBoss Aop for JDK50.</description>
+ </lib>
+
+ <lib name="jboss-common">
+ <jar>jboss-common.jar</jar>
+ <version>4.0.3</version>
+ <description>JBoss common classes</description>
+ </lib>
+
+ <lib name="jboss-j2ee">
+ <jar>jboss-j2ee.jar</jar>
+ <version>4.0.3</version>
+ <description>j2ee interfaces</description>
+ </lib>
+
+ <lib name="jboss-jmx">
+ <jar>jboss-jmx.jar</jar>
+ <version>4.0.3</version>
+ <description>jmx implementaiton</description>
+ </lib>
+
+ <lib name="jboss-minimal">
+ <jar>jboss-minimal.jar</jar>
+ <version>4.0.3</version>
+ <description></description>
+ </lib>
+
+ <lib name="jboss-system">
+ <jar>jboss-system.jar</jar>
+ <version>4.0.3</version>
+ <description></description>
+ </lib>
+
+ <lib name="jgroups">
+ <jar>jgroups.jar</jar>
+ <version>2.2.7</version>
+ <version>2.2.8</version>
+ <description>Reliable messaging library. Used in replication.</description>
+ </lib>
+
+ <lib name="junit">
+ <jar>junit.jar</jar>
+ <version>3.8.1</version>
+ <description>Unit testing framework. Used for examples.</description>
+ </lib>
+
+ <lib name="sleepycat">
+ <jar>sleepycat/je.jar</jar>
+ <version>1.7.0</version>
+ <version>2.0.54</version>
+ <description>Embeded DB. Used for JE cache loader.</description>
+ </lib>
+
+ <lib name="trove">
+ <jar>trove.jar</jar>
+ <version>1.0.2</version>
+ <description>High performance collections for Java. Used by Aop.</description>
+ </lib>
+
+</dependencies>
+
+
+
+
+
Deleted: core/trunk/src/main/resources/jndi.properties
===================================================================
--- core/trunk/src/main/etc/jndi.properties 2008-06-26 14:57:18 UTC (rev 6057)
+++ core/trunk/src/main/resources/jndi.properties 2008-06-26 16:40:06 UTC (rev 6060)
@@ -1,5 +0,0 @@
-# DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING
-#
-#java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-#java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-#java.naming.provider.url=localhost:1099
\ No newline at end of file
Copied: core/trunk/src/main/resources/jndi.properties (from rev 6059, core/trunk/src/main/etc/jndi.properties)
===================================================================
--- core/trunk/src/main/resources/jndi.properties (rev 0)
+++ core/trunk/src/main/resources/jndi.properties 2008-06-26 16:40:06 UTC (rev 6060)
@@ -0,0 +1,5 @@
+# DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING
+#
+#java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+#java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+#java.naming.provider.url=localhost:1099
\ No newline at end of file
Modified: core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTransformerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTransformerTest.java 2008-06-26 16:32:57 UTC (rev 6059)
+++ core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTransformerTest.java 2008-06-26 16:40:06 UTC (rev 6060)
@@ -1,7 +1,6 @@
package org.jboss.cache.config;
import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
import org.jboss.cache.config.parsing.ConfigFilesConvertor;
import org.jboss.cache.config.parsing.XmlConfigurationParser;
import org.jboss.cache.config.parsing.XmlConfigurationParser2x;
More information about the jbosscache-commits
mailing list