2:01 a.m.
Author: smumford
Date: 2010-08-09 03:01:37 -0400 (Mon, 09 Aug 2010)
New Revision: 3774
Added:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default29.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default30.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default31.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default70.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.xml
Removed:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.java
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.java
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default14.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default16.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default17.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default18.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default19.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default35.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/default144.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default187.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default188.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml
Log:
JBEPP-370: Further clean-up of programlisting rendering
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.0</productnumber>
<edition>1</edition>
- <pubsnumber>1.5</pubsnumber>
+ <pubsnumber>1.7</pubsnumber>
<abstract>
<para>
This Reference Guide is a high-level usage document. It deals with more advanced
topics than the Installation and User Guides, adding new content or taking concepts
discussed in the earlier documents further. It aims to provide supporting documentation
for advanced users of the &PRODUCT; product. Its primary focus is on advanced use of
the product and it assumes an intermediate or advanced knowledge of the technology and
terms.
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -8,6 +8,34 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1.7</revnumber>
+ <date>Mon Aug 9 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Further clean-up of programlisting rendering.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>1.6</revnumber>
+ <date>Thu Aug 5 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Extracted code snippets.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>1.5</revnumber>
<date>Thu Jul 29 2010</date>
<author>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default14.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default14.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default14.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -16,7 +16,6 @@
<property name="swap-directory"
value="../temp/swap/production" />
</properties>
<value-storages>
-
</value-storages>
</container>
<initializer
class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
@@ -25,13 +24,10 @@
</properties>
</initializer>
<cache enabled="true"
class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
-
</cache>
<query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
-
</query-handler>
<lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
-
</lock-manager>
</workspace>
<workspace name="ws2">
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default16.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default16.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default16.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -1,7 +1,8 @@
<value-storages>
<value-storage id="system"
class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
- <property name="path"
value="/mnt/tornado/temp/values/production" /> <!--path within NFS
where ValueStorage will hold it's data-->
+ <property name="path"
value="/mnt/tornado/temp/values/production" />
+ <!--path within NFS where ValueStorage will hold it's data-->
</properties>
<filters>
<filter property-type="Binary" />
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default17.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default17.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default17.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -1,9 +1,12 @@
-<cache enabled="true"
class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.
-JBossCacheWorkspaceStorageCache">
+<cache enabled="true"
class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration"
value="jar:/conf/portal/test-jbosscache-data.xml" />
- <property name="jgroups-configuration"
value="jar:/conf/portal/udp-mux.xml" />
- <property name="jbosscache-cluster-name"
value="JCR_Cluster_cache_production" />
- <property name="jgroups-multiplexer-stack" value="true"
/>
+ <property name="jbosscache-configuration"
+ value="jar:/conf/portal/test-jbosscache-data.xml"/>
+ <property name="jgroups-configuration"
+ value="jar:/conf/portal/udp-mux.xml"/>
+ <property name="jbosscache-cluster-name"
+ value="JCR_Cluster_cache_production"/>
+ <property name="jgroups-multiplexer-stack"
+ value="true" />
</properties>
</cache>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default18.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default18.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default18.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -1,10 +1,14 @@
<query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
<property name="changesfilter-class"
value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter"
/>
- <property name="index-dir"
value="/mnt/tornado/temp/jcrlucenedb/production" />
<!-- path within NFS where ValueStorage will hold it's data -->
- <property name="jbosscache-configuration"
value="jar:/conf/portal/test-jbosscache-indexer.xml" /> <!-- path to
JBoss Cache configuration for indexer -->
- <property name="jgroups-configuration"
value="jar:/conf/portal/udp-mux.xml" /> <!-- path
to JGroups configuration -->
- <property name="jbosscache-cluster-name"
value="JCR_Cluster_indexer_production" /> <!-- JBoss
Cache indexer cluster name -->
+ <property name="index-dir"
value="/mnt/tornado/temp/jcrlucenedb/production" />
+ <!-- path within NFS where ValueStorage will hold it's data -->
+ <property name="jbosscache-configuration"
value="jar:/conf/portal/test-jbosscache-indexer.xml" />
+ <!-- path to JBoss Cache configuration for indexer -->
+ <property name="jgroups-configuration"
value="jar:/conf/portal/udp-mux.xml" />
+ <!-- path to JGroups configuration -->
+ <property name="jbosscache-cluster-name"
value="JCR_Cluster_indexer_production" />
+ <!-- JBoss Cache indexer cluster name -->
<property name="jgroups-multiplexer-stack" value="true"
/>
</properties>
</query-handler>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default19.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default19.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default19.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -1,12 +1,15 @@
<lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration"
value="jar:/conf/portal/test-jbosscache-lock.xml" /> <!-- path to
JBoss Cache configuration for lock manager -->
- <property name="jgroups-configuration"
value="jar:/conf/portal/udp-mux.xml" /> <!-- path
to JGroups configuration -->
+ <property name="jbosscache-configuration"
value="jar:/conf/portal/test-jbosscache-lock.xml" />
+ <!-- path to JBoss Cache configuration for lock manager -->
+ <property name="jgroups-configuration"
value="jar:/conf/portal/udp-mux.xml" />
+ <!-- path to JGroups configuration -->
<property name="jgroups-multiplexer-stack" value="true"
/>
- <property name="jbosscache-cluster-name"
value="JCR_Cluster_lock_production" /> <!-- JBoss
Cache locks cluster name -->
-
- <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_production"/> <!-- the name of the DB
table where lock's data will be stored -->
+ <property name="jbosscache-cluster-name"
value="JCR_Cluster_lock_production" />
+ <!-- JBoss Cache locks cluster name -->
+ <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_production"/>
+ <!-- the name of the DB table where lock's data will be stored -->
<property name="jbosscache-cl-cache.jdbc.table.create"
value="true"/>
<property name="jbosscache-cl-cache.jdbc.table.drop"
value="false"/>
<property name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_production_pk"/>
Added:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default29.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default29.xml
(rev 0)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default29.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -0,0 +1 @@
+<property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock-db1-ws1.xml" />
Added:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default30.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default30.xml
(rev 0)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default30.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -0,0 +1,4 @@
+...
+<clustering mode="replication"
clusterName="${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"
/>
+...
Added:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default31.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default31.xml
(rev 0)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default31.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -0,0 +1,4 @@
+...
+<property name="jbosscache-configuration"
value="jar:/conf/portal/jbosscache-lock.xml" />
+<property name="jbosscache-cluster-name"
value="JCR-cluster-locks-db1-ws" />
+...
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default35.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default35.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default35.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
- <locking useLockStriping="false" concurrencyLevel="50000"
lockParentForChildInsertRemove="false"
- lockAcquisitionTimeout="20000" />
- <clustering mode="replication"
clusterName="${jbosscache-cluster-name}">
+ <locking useLockStriping="false" concurrencyLevel="50000"
lockParentForChildInsertRemove="false"
lockAcquisitionTimeout="20000"/>
+ <clustering mode="replication"
clusterName="${jbosscache-cluster-name}">
<stateRetrieval timeout="20000" fetchInMemoryState="false"
/>
<jgroupsConfig multiplexerStack="jcr.stack" />
<sync />
@@ -12,8 +11,7 @@
<preload>
<node fqn="/" />
</preload>
- <loader class="org.jboss.cache.loader.JDBCCacheLoader"
async="false" fetchPersistentState="false"
- ignoreModifications="false" purgeOnStartup="false">
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader"
async="false" fetchPersistentState="false"
ignoreModifications="false" purgeOnStartup="false">
<properties>
cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name}
cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create}
Added:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default70.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default70.xml
(rev 0)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default70.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -0,0 +1 @@
+<param name="indexing-configuration-path"
value="/indexing_configuration.xml"/>
Deleted:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.java
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.java 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.java 2010-08-09
07:01:37 UTC (rev 3774)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE configuration SYSTEM
"http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0">
- <index-rule nodeType="nt:unstructured"
- boost="2.0">
- <property>Text</property>
- </index-rule>
-</configuration>
Copied:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.xml
(from rev 3746,
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.java)
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.xml
(rev 0)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE configuration SYSTEM
"http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd">
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0">
+ <index-rule nodeType="nt:unstructured"
+ boost="2.0">
+ <property>Text</property>
+ </index-rule>
+</configuration>
Deleted:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.java
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.java 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.java 2010-08-09
07:01:37 UTC (rev 3774)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE configuration SYSTEM
"http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd">
-<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0">
- <index-rule nodeType="nt:unstructured">
- <property boost="3.0">Title</property>
- <property boost="1.5">Text</property>
- </index-rule>
-</configuration>
Copied:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.xml
(from rev 3746,
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.java)
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.xml
(rev 0)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE configuration SYSTEM
"http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd">
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0">
+ <index-rule nodeType="nt:unstructured">
+ <property boost="3.0">Title</property>
+ <property boost="1.5">Text</property>
+ </index-rule>
+</configuration>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/default144.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/default144.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/default144.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -6,26 +6,22 @@
<name>new.portal.config.user.listener</name>
<set-method>initListener</set-method>
<type>org.exoplatform.portal.config.NewPortalConfigListener</type>
- <description>this listener init the portal configuration</descript
-ion>
+ <description>this listener init the portal configuration</description>
<init-params>
<value-param>
<name>default.portal</name>
- <description>The default portal for checking db is empty or no
-t</description>
+ <description>The default portal for checking db is empty or
not</description>
<value>classic</value>
</value-param>
<value-param>
<name>page.templates.location</name>
- <description>the path to the location that contains Page templ
-ates</description>
+ <description>the path to the location that contains Page
templates</description>
<value>war:/conf/portal/template/pages</value>
</value-param>
<object-param>
<name>site.templates.location</name>
<description>description</description>
- <object type="org.exoplatform.portal.config.SiteConfigTemplate
-">
+ <object
type="org.exoplatform.portal.config.SiteConfigTemplate">
<field name="location">
<string>war:/conf/portal</string>
</field>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default187.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default187.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default187.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -1 +1 @@
-.UIChangeSkinForm .UIItemSelector .TemplateContainer .<emphasis
role="bold">MySkinImage</emphasis>
+.UIChangeSkinForm .UIItemSelector .TemplateContainer .MySkinImage
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default188.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default188.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default188.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -1,4 +1,4 @@
-.UIChangeSkinForm .UIItemSelector .TemplateContainer .<emphasis
role="bold">MySkinImage</emphasis> {
+.UIChangeSkinForm .UIItemSelector .TemplateContainer .MySkinImage
margin: auto;
width: 329px; height:204px;
background: url('background/MySkin.jpg') no-repeat top;
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -162,7 +162,6 @@
<areaspec>
<area coords="6"
id="area-Reference_Guide-Configuration_syntax-Includes_and_special_URLs-url_schema"
/>
</areaspec>
-<!-- TODO highlight once Publican 1.6.3 installed (XML)-->
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../extras/Advanced_Development_Foundations/default2.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -98,10 +98,10 @@
<programlistingco>
<areaspec>
- <area coords="19"
id="Reference_Guide-Configuring_JBoss_AS_with_eXo_JCR_in_cluster-value-storages"/>
- <area coords="28"
id="Reference_Guide-Configuring_JBoss_AS_with_eXo_JCR_in_cluster-cache"/>
- <area coords="31"
id="Reference_Guide-Configuring_JBoss_AS_with_eXo_JCR_in_cluster-indexer"/>
- <area coords="34"
id="Reference_Guide-Configuring_JBoss_AS_with_eXo_JCR_in_cluster-lock-manager"/>
+ <area coords="18 60"
id="Reference_Guide-Configuring_JBoss_AS_with_eXo_JCR_in_cluster-value-storages"/>
+ <area coords="27 60"
id="Reference_Guide-Configuring_JBoss_AS_with_eXo_JCR_in_cluster-cache"/>
+ <area coords="29 60"
id="Reference_Guide-Configuring_JBoss_AS_with_eXo_JCR_in_cluster-indexer"/>
+ <area coords="31 60"
id="Reference_Guide-Configuring_JBoss_AS_with_eXo_JCR_in_cluster-lock-manager"/>
</areaspec>
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_cluster-config/default14.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
@@ -246,9 +246,9 @@
</para>
<programlistingco>
<areaspec>
- <area coords="3"
id="Reference_Guide-Requirements-Environment_requirements-jboss_cache_config"/>
- <area coords="4"
id="Reference_Guide-Requirements-Environment_requirements-jgroups_config"/>
- <area coords="5"
id="Reference_Guide-Requirements-Environment_requirements-cluster_name"/>
+ <area coords="3 60"
id="Reference_Guide-Requirements-Environment_requirements-jboss_cache_config"/>
+ <area coords="5 60"
id="Reference_Guide-Requirements-Environment_requirements-jgroups_config"/>
+ <area coords="7 60"
id="Reference_Guide-Requirements-Environment_requirements-cluster_name"/>
</areaspec>
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_cluster-config/default17.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -44,9 +44,9 @@
</para>
<programlistingco>
<areaspec>
- <area coords="13"
id="Reference_Guide-The_The_JCR_Configuration_persister-source-name"/>
- <area coords="14"
id="Reference_Guide-The_The_JCR_Configuration_persister-dialect"/>
- <area coords="15"
id="Reference_Guide-The_The_JCR_Configuration_persister-persister-class-name"/>
+ <area coords="13 80"
id="Reference_Guide-The_The_JCR_Configuration_persister-source-name"/>
+ <area coords="14 80"
id="Reference_Guide-The_The_JCR_Configuration_persister-dialect"/>
+ <area coords="15 80"
id="Reference_Guide-The_The_JCR_Configuration_persister-persister-class-name"/>
</areaspec>
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_configuration-persister/default21.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -168,9 +168,9 @@
</para>
<programlistingco>
<areaspec>
- <area coords="10"
id="area-Reference_Guide-eXo_JCR_configuration-Portal_and_Standalone_configuration-JCR_Service_Configuration-conf-path"
/>
- <area coords="15"
id="area-Reference_Guide-eXo_JCR_configuration-Portal_and_Standalone_configuration-JCR_Service_Configuration-working-conf"
/>
- </areaspec>
+ <area coords="10 40"
id="area-Reference_Guide-eXo_JCR_configuration-Portal_and_Standalone_configuration-JCR_Service_Configuration-conf-path"
/>
+ <area coords="15 40"
id="area-Reference_Guide-eXo_JCR_configuration-Portal_and_Standalone_configuration-JCR_Service_Configuration-working-conf"
/>
+ </areaspec>
<!-- DOC TODO: There is no exo-configuration.xml file in the jar or in the svn trunk/.
Does this file exist? -->
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_Configuration/default23.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
@@ -197,11 +197,11 @@
</properties-param>
</init-params>
</component>]]></programlisting>-->
- <calloutlist>
+ <calloutlist>
<callout
arearefs="area-Reference_Guide-eXo_JCR_configuration-Portal_and_Standalone_configuration-JCR_Service_Configuration-conf-path">
<para>
<literal><conf-path></literal> is a path to a
<literal>RepositoryService</literal> JCR Configuration. The .xml file in the
example is not in the released jar file.
-<!-- Added last sentence as per advice from Villiam Rockai that file does not exist in
jar file -->
+ Added last sentence as per advice from Villiam Rockai that file does not exist in jar
file
</para>
</callout>
<callout
arearefs="area-Reference_Guide-eXo_JCR_configuration-Portal_and_Standalone_configuration-JCR_Service_Configuration-working-conf">
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -105,7 +105,7 @@
<value-storages>]]></programlisting>-->
</section>
- <section
id="sect-Reference_Guide-External_Value_Storages-Simple_File_Value_Storage">
+ <!--<section
id="sect-Reference_Guide-External_Value_Storages-Simple_File_Value_Storage">
<title>Simple File Value Storage</title>
<note>
<para>
@@ -121,15 +121,15 @@
<programlisting language="Java" role="Java"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_external-value-storages/default27.java"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-<!--<programlisting><value-storage id="Storage #1"
class="org.exoplatform.services.jcr.impl.storage.value.fs.SimpleFileValueStorage">
+<programlisting><value-storage id="Storage #1"
class="org.exoplatform.services.jcr.impl.storage.value.fs.SimpleFileValueStorage">
<properties>
<property name="path" value="data/values"/>
</properties>
<filters>
<filter property-type="Binary"
min-value-size="1M"/>
</filters>
-</programlisting>-->
- </section>
+</programlisting>
+ </section>-->
<section
id="sect-Reference_Guide-External_Value_Storages-Content_Addressable_Value_storage_CAS_support">
<title>Content Addressable Value storage (CAS) support</title>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -17,7 +17,7 @@
For example:
</para>
-<programlisting language="Java" role="Java"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jbosscache-configuration-templates/default29.java"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jbosscache-configuration-templates/default29.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<!--<programlisting><property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock-db1-ws1.xml" />
</programlisting>-->
@@ -34,7 +34,7 @@
The xml-template:
</para>
-<programlisting language="Java" role="Java"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jbosscache-configuration-templates/default30.java"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jbosscache-configuration-templates/default30.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<!--<programlisting language="XML"
role="XML"><![CDATA[...
<clustering mode="replication"
clusterName="${jbosscache-cluster-name}">
@@ -43,7 +43,7 @@
<para>
The JCR configuration file:
</para>
-<programlisting language="Java" role="Java"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jbosscache-configuration-templates/default31.java"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jbosscache-configuration-templates/default31.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<!--<programlisting language="XML"
role="XML"><![CDATA[...
<property name="jbosscache-configuration"
value="jar:/conf/portal/jbosscache-lock.xml" />
@@ -95,7 +95,7 @@
</para>
<programlistingco>
<areaspec>
- <area coords="7"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cluster-name"/>
+ <area coords="6 60"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cluster-name"/>
</areaspec>
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jbosscache-configuration-templates/default34.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
@@ -143,17 +143,17 @@
</para>
<programlistingco>
<areaspec>
- <area coords="6"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cluster-name1"/>
- <area coords="18"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.table.name"/>
- <area coords="19"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.table.create"/>
- <area coords="20"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.table.drop"/>
- <area coords="21"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.table.primarykey"/>
- <area coords="22"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.fqn.column"/>
- <area coords="23"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.fqn.type"/>
- <area coords="24"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.node.column"/>
- <area coords="25"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.node.type"/>
- <area coords="26"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.parent.column"/>
- <area coords="27"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.datasource"/>
+ <area coords="5 90"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cluster-name1"/>
+ <area coords="16 90"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.table.name"/>
+ <area coords="17 90"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.table.create"/>
+ <area coords="18 90"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.table.drop"/>
+ <area coords="19 90"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.table.primarykey"/>
+ <area coords="20 90"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.fqn.column"/>
+ <area coords="21 90"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.fqn.type"/>
+ <area coords="22 90"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.node.column"/>
+ <area coords="23 90"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.node.type"/>
+ <area coords="24 90"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.parent.column"/>
+ <area coords="25 90"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cl-cache.jdbc.datasource"/>
</areaspec>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -254,8 +254,10 @@
<para>
The following example is in standalone mode with two data containers
<parameter>jdbcjcr</parameter> (a local HSQLDB) and
<parameter>jdbcjcr1</parameter> (a remote MySQL container):
</para>
+
+<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default38.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-<programlisting language="XML"
role="XML"><![CDATA[<component>
+<!--<programlisting language="XML"
role="XML"><![CDATA[<component>
<key>org.exoplatform.services.naming.InitialContextInitializer</key>
<type>org.exoplatform.services.naming.InitialContextInitializer</type>
<component-plugins>
@@ -324,6 +326,7 @@
</value-param>
</init-params>
</component>]]></programlisting>
+-->
</step>
<step>
<para>
@@ -408,8 +411,10 @@
<para>
The following example contains two workspaces <parameter>ws</parameter>
(<literal>jdbcjcr</literal>) and <parameter>ws1</parameter>
(<literal>jdbcjcr1</literal>):
</para>
+
+<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-<programlisting><workspaces>
+<!--<programlisting><workspaces>
<workspace name="ws"
auto-init-root-nodetype="nt:unstructured">
<container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
@@ -422,8 +427,8 @@
</container>
<cache enabled="true">
<properties>
- <property name="max-size"
value="10K"/><!-- 10KBytes -->
- <property name="live-time"
value="30m"/><!-- 30 min -->
+ <property name="max-size"
value="10K"/><!- 10KBytes ->
+ <property name="live-time"
value="30m"/><!- 30 min ->
</properties>
</cache>
<query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -432,7 +437,7 @@
</properties>
</query-handler>
<lock-manager>
- <time-out>15m</time-out><!-- 15 min -->
+ <time-out>15m</time-out><!- 15 min ->
<persister
class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
<properties>
<property name="path"
value="target/temp/lock/ws"/>
@@ -462,7 +467,7 @@
</properties>
</query-handler>
<lock-manager>
- <time-out>15m</time-out><!-- 15 min -->
+ <time-out>15m</time-out><!- 15 min ->
<persister
class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
<properties>
<property name="path"
value="target/temp/lock/ws1"/>
@@ -471,7 +476,7 @@
</lock-manager>
</workspace>
</workspaces>
-</programlisting>
+</programlisting>-->
<variablelist>
<varlistentry>
@@ -596,7 +601,9 @@
The following example shows the settings for embedded mode for the
<parameter>jdbcjcr</parameter> data container:
</para>
-<programlisting language="XML"
role="XML"><![CDATA[<external-component-plugins>
+<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default40.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+
+<!--<programlisting language="XML"
role="XML"><![CDATA[<external-component-plugins>
<target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>
<component-plugin>
<name>bind.datasource</name>
@@ -629,14 +636,17 @@
</init-params>
</component-plugin>
</external-component-plugins>]]></programlisting>
- <para>
+-->
+ <para>
To configure multiple repository workspaces with a single database the
"multi-db" parameter must be switched off (set the value to "false").
</para>
<para>
The following example shows configuration for two workspaces
<parameter>ws</parameter> (jdbcjcr) and <parameter>ws1</parameter>
(jdbcjcr) which will be persisted in one <application>PostgreSQL</application>
database:
</para>
-<programlisting language="XML"
role="XML"><![CDATA[<workspaces>
+<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default41.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+
+<!--<programlisting language="XML"
role="XML"><![CDATA[<workspaces>
<workspace name="ws"
auto-init-root-nodetype="nt:unstructured">
<container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
@@ -693,7 +703,7 @@
</lock-manager>
</workspace>
</workspaces>]]></programlisting>
-
+-->
<section
id="sect-Reference_Guide-Single_database_configuration-Configuration_without_DataSource">
<title>Configuration without DataSource</title>
<para>
@@ -712,7 +722,9 @@
</step>
</procedure>
-<programlisting language="XML"
role="XML"><![CDATA[<workspace name="ws"
auto-init-root-nodetype="nt:unstructured">
+<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default42.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+
+<!--<programlisting language="XML"
role="XML"><![CDATA[<workspace name="ws"
auto-init-root-nodetype="nt:unstructured">
<container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
<property name="dialect" value="hsqldb"/>
@@ -720,7 +732,7 @@
<property name="url"
value="jdbc:hsqldb:file:target/temp/data/portal"/>
<property name="username" value="su"/>
<property name="password" value=""/>
- ......]]></programlisting>
+ ......]]></programlisting>-->
<note>
<para>
Ensure the JDBC driver provides connection pooling. Connection pooling is required
for use with JCR to prevent a database overload.
@@ -836,7 +848,7 @@
</note>
</section>
-<!--Traiged <section
id="sect-Reference_Guide-JDBC_Data_Container_Config-Notes_for_Microsoft_Windows_users">
+ <section
id="sect-Reference_Guide-JDBC_Data_Container_Config-Notes_for_Microsoft_Windows_users">
<title>Notes for Microsoft Windows users</title>
<para>
The current configuration of eXo JCR uses Apache DBCP connection pool
(<classname>org.apache.commons.dbcp.BasicDataSourceFactory</classname>).
It's possible to set a big value for maxActive parameter in
<filename>configuration.xml</filename>. That means usage of lots of TCP/IP
ports from a client machine inside the pool (i.e. JDBC driver). As a result the data
container can throw exceptions like "Address already in use". To solve this
problem you have to configure the client's machine networking software for the usage
of shorter timeouts for opened TCP/IP ports.
@@ -865,8 +877,8 @@
"TcpTimedWaitDelay"=dword:0000001e
</programlisting>
</para>
- </section> -->
</section>
+ </section>
</section>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -118,7 +118,7 @@
<para>
Below is an example of creating a UTF-8 database using the
<parameter>db2</parameter> dialect for a workspace container with DB2 version
9 and higher:
</para>
-
+<!--DOC TODO: Find out what programming language this is written in for syntax
highlighting-->
<programlisting>DB2 CREATE DATABASE dbname USING CODESET UTF-8 TERRITORY US
</programlisting>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml 2010-08-09
03:37:32 UTC (rev 3773)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml 2010-08-09
07:01:37 UTC (rev 3774)
@@ -706,15 +706,15 @@
To configure an application to use a new <literal>SearchIndex</literal>,
replace the following code:
</para>
-<programlisting><query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
-</programlisting>
+<programlisting language="XML"
role="XML"><![CDATA[<query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+]]></programlisting>
<para>
...in
<filename>portal/WEB-INF/conf/jcr/repository-configuration.xml</filename> with
the new class
</para>
-<programlisting><query-handler
class="<replaceable>mypackage.indexation.MySearchIndex</replaceable>">
-</programlisting>
+<programlisting language="XML"
role="XML"><![CDATA[<query-handler
class="mypackage.indexation.MySearchIndex>
+]]></programlisting>
<para>
To configure an application to use a new analyzer, add the
"<parameter>analyzer</parameter>" parameter to each query-handler
configuration in
<filename>portal/WEB-INF/conf/jcr/repository-configuration.xml</filename>:
@@ -748,7 +748,7 @@
To configure the indexing behavior add a parameter to the query-handler element in
your configuration file.
</para>
-<programlisting><param name="indexing-configuration-path"
value="/indexing_configuration.xml"/>
+<programlisting language="XML" role="XML"><![CDATA[<param
name="indexing-configuration-path"
value="/indexing_configuration.xml"/>]]>
</programlisting>
@@ -770,7 +770,7 @@
<index-rule nodeType="nt:unstructured">
<property>Text</property>
</index-rule>
-</configuration>]]></programlisting>-->
+</configuration>]]></programlisting> -->
<note>
<title>Namespace Prefixes</title>
<para>
@@ -782,7 +782,7 @@
It is also possible to configure a <phrase>boost value</phrase> for the
nodes that match the index rule. The default boost value is 1.0. Higher boost values (a
reasonable range is 1.0 - 5.0) will yield a higher score value and appear as more
relevant.
</para>
-<programlisting language="Java" role="Java"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_search-configuration/default72.java"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_search-configuration/default72.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<!--<programlisting><?xml version="1.0"?>
<!DOCTYPE configuration SYSTEM
"http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd">
@@ -797,7 +797,7 @@
If you do not wish to boost the complete node, but only certain properties, you can
also provide a boost value for the listed properties:
</para>
-<programlisting language="Java" role="Java"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_search-configuration/default73.java"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_search-configuration/default73.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<!--<programlisting><?xml version="1.0"?>
<!DOCTYPE configuration SYSTEM
"http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd">
@@ -1018,7 +1018,7 @@
<para>
If the query is:
</para>
-<programlisting>xpath = "//*[jcr:contains(mytext,'analyzer')]"
+<programlisting language="Java" role="JAVA">xpath =
"//*[jcr:contains(mytext,'analyzer')]"
</programlisting>
<para>
@@ -1027,7 +1027,7 @@
<para>
Also, if a search is done on the node scope as follows:
</para>
-<programlisting>xpath = "//*[jcr:contains(.,'analyzer')]"
+<programlisting language="Java" role="JAVA">xpath =
"//*[jcr:contains(.,'analyzer')]"
</programlisting>
<para>
No result will be returned.
@@ -1038,22 +1038,22 @@
<para>
If the analyzer used to index the "mytext" property above is changed to:
</para>
-<programlisting><analyzer
class="org.apache.lucene.analysis.Analyzer.GermanAnalyzer">
- <property>mytext</property>
-</analyzer>
-</programlisting>
+<programlisting language="XML"
role="XML"><![CDATA[<analyzer
class="org.apache.lucene.analysis.Analyzer.GermanAnalyzer">
+ <property>mytext</property>
+</analyzer>
+]]></programlisting>
<para>
The search below would return a result because of the word stemming (analyzers -
analyzer).
</para>
-<programlisting>xpath = "//*[jcr:contains(mytext,'analyzer')]"
+<programlisting language="Java" role="JAVA">xpath =
"//*[jcr:contains(mytext,'analyzer')]"
</programlisting>
<para>
The second search in the example:
</para>
-<programlisting>xpath = "//*[jcr:contains(.,'analyzer')]"
+<programlisting language="Java" role="JAVA">xpath =
"//*[jcr:contains(.,'analyzer')]"
</programlisting>
<para>
Would still not give a result, since the node scope is indexed with the global
analyzer, which in this case does not take into account any word stemming.