You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2008/10/07 16:45:16 UTC
svn commit: r702497 - in
/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources:
assembly/ conf/jetspeed/
Author: vkumar
Date: Tue Oct 7 07:45:13 2008
New Revision: 702497
URL: http://svn.apache.org/viewvc?rev=702497&view=rev
Log:
Moving all jetspeed configuration data from assemblies file to jetspeed.properties
Now jetspeed.properties would only location to make changes in all configuration of jetspeed.
Removed:
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/hierarchical-principal-names.xml
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/search.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/statistics.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml?rev=702497&r1=702496&r2=702497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml Tue Oct 7 07:45:13 2008
@@ -119,10 +119,10 @@
<value>${autodeployment.target.dir}</value>
</constructor-arg>
<constructor-arg index="3">
- <value>${applicationRoot}/WEB-INF/apps</value>
+ <value>${autodeployment.apps.internal.path}</value>
</constructor-arg>
<constructor-arg index="4">
- <value>${autodeployment.staging.dir}/local</value>
+ <value>${autodeployment.apps.local.path}</value>
</constructor-arg>
<!-- strip commons-logging and/or log4j jars from war files: for JBoss set this to true -->
<constructor-arg index="5">
@@ -136,7 +136,7 @@
<bean id="decoratorDeploymentListener" class="org.apache.jetspeed.deployment.impl.DeployDecoratorEventListener">
<meta key="j2:cat" value="default" />
<constructor-arg>
- <value>${applicationRoot}/decorations</value>
+ <value>${portal.core.decorations.path}</value>
</constructor-arg>
</bean>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml?rev=702497&r1=702496&r2=702497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml Tue Oct 7 07:45:13 2008
@@ -147,11 +147,11 @@
</constructor-arg>
<!-- permissions security enabled flag, default=false -->
<constructor-arg index="4">
- <value>false</value>
+ <value>${castorXmlPageManager.permission}</value>
</constructor-arg>
<!-- constraints security enabled flag, default=true -->
<constructor-arg index="5">
- <value>false</value>
+ <value>${castorXmlPageManager.constraints}</value>
</constructor-arg>
</bean>
@@ -161,11 +161,11 @@
<meta key="j2:cat" value="default" />
<!-- Scan rate for changes in cached files on the file system -->
<constructor-arg index="0">
- <value>10</value>
+ <value>${page.file.cache.scanRate}</value>
</constructor-arg>
<!-- Cache size -->
<constructor-arg index="1">
- <value>100</value>
+ <value>${page.file.cache.size}</value>
</constructor-arg>
</bean>
@@ -174,11 +174,11 @@
<meta key="j2:cat" value="default" />
<!-- ID Start value -->
<constructor-arg index="0">
- <value>65536</value>
+ <value>${portal.core.id.generator.start}</value>
</constructor-arg>
<!-- ID Prefix -->
<constructor-arg index="1">
- <value>P-</value>
+ <value>${portal.core.id.prefix}</value>
</constructor-arg>
<!-- ID Suffix -->
<constructor-arg index="2">
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml?rev=702497&r1=702496&r2=702497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml Tue Oct 7 07:45:13 2008
@@ -24,11 +24,11 @@
<meta key="j2:cat" value="default,base" />
<!-- ID Start value -->
<constructor-arg index="0">
- <value>65536</value>
+ <value>${portal.core.id.generator.start}</value>
</constructor-arg>
<!-- ID Prefix -->
<constructor-arg index="1">
- <value>P-</value>
+ <value>${portal.core.id.prefix}</value>
</constructor-arg>
<!-- ID Suffix -->
<constructor-arg index="2">
@@ -42,11 +42,11 @@
<meta key="j2:cat" value="default,base" />
<!-- Scan rate for changes in cached files on the file system -->
<constructor-arg index="0">
- <value>10</value>
+ <value>${page.file.cache.scanRate}</value>
</constructor-arg>
<!-- Cache size -->
<constructor-arg index="1">
- <value>100</value>
+ <value>${page.file.cache.size}</value>
</constructor-arg>
</bean>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml?rev=702497&r1=702496&r2=702497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml Tue Oct 7 07:45:13 2008
@@ -37,7 +37,7 @@
<meta key="j2:cat" value="default" />
<constructor-arg>
<list>
- <value>${applicationRoot}/WEB-INF/templates</value>
+ <value>${portal.core.templates.path}</value>
</list>
</constructor-arg>
<constructor-arg>
@@ -50,7 +50,7 @@
<meta key="j2:cat" value="default" />
<constructor-arg>
<list>
- <value>${applicationRoot}/decorations</value>
+ <value>${portal.core.decorations.path}</value>
</list>
</constructor-arg>
<constructor-arg>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml?rev=702497&r1=702496&r2=702497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml Tue Oct 7 07:45:13 2008
@@ -153,12 +153,12 @@
</constructor-arg>
<!-- folder/page/link cache size, default=128, min=128 -->
<constructor-arg index="1">
- <value>128</value>
+ <value>${dbPageManager.cache.size}</value>
</constructor-arg>
<!-- folder/page/link cache expires seconds, default=-1, infinite=0, min=30 -->
<!-- (default is 150 seconds) -->
<constructor-arg index="2">
- <value>-1</value>
+ <value>${dbPageManager.cache.expire}</value>
</constructor-arg>
<!-- permissions security enabled flag, default=false -->
<constructor-arg index="3">
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/search.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/search.xml?rev=702497&r1=702496&r2=702497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/search.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/search.xml Tue Oct 7 07:45:13 2008
@@ -40,13 +40,13 @@
<bean id="org.apache.jetspeed.search.SearchEngine" class="org.apache.jetspeed.search.lucene.SearchEngineImpl">
<meta key="j2:cat" value="default,search" />
<constructor-arg index="0">
- <value>${applicationRoot}/WEB-INF/search_index</value>
+ <value>${search.index.location}</value>
</constructor-arg>
<constructor-arg index="1">
<null />
</constructor-arg>
<constructor-arg type="boolean">
- <value>true</value>
+ <value>${search.index.optimizeAfterUpdate}</value>
</constructor-arg>
<constructor-arg>
<ref bean="org.apache.jetspeed.search.HandlerFactory" />
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/statistics.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/statistics.xml?rev=702497&r1=702496&r2=702497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/statistics.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/statistics.xml Tue Oct 7 07:45:13 2008
@@ -24,42 +24,42 @@
<meta key="j2:cat" value="default" />
<!-- logToCLF -->
<constructor-arg index='0' type="boolean">
- <value>false</value>
+ <value>${portal.statistics.logToLogger}</value>
</constructor-arg>
<!-- logToDatabase -->
<constructor-arg index='1' type="boolean">
- <value>true</value>
+ <value>${portal.statistics.logToDatabase}</value>
</constructor-arg>
<!-- maxRecordToFlush_Portal -->
<constructor-arg index='2'>
- <value>300</value>
+ <value>${portal.statistics.MaxPortalRecordToFlush}</value>
</constructor-arg>
<!-- maxRecordToFlush_User -->
<constructor-arg index='3'>
- <value>50</value>
+ <value>${portal.statistics.MaxUserUserRecordToFlush}</value>
</constructor-arg>
<!-- maxRecordToFlush_Page -->
<constructor-arg index='4'>
- <value>100</value>
+ <value>${portal.statistics.MaxPagePageRecordToFlush}</value>
</constructor-arg>
<!-- maxTimeMsToFlush_Portal -->
<constructor-arg index='5'>
- <value>300000</value>
+ <value>${portal.statistics.MaxTimePortalToFlush}</value>
</constructor-arg>
<!-- maxTimeMsToFlush_User -->
<constructor-arg index='6'>
- <value>5000</value>
+ <value>${portal.statistics.MaxTimeUserToFlush}</value>
</constructor-arg>
<!-- maxTimeMsToFlush_Page -->
<constructor-arg index='7'>
- <value>60000</value>
+ <value>${portal.statistics.MaxTimePageToFlush}</value>
</constructor-arg>
<!-- jetspeedDSEntry -->
@@ -75,7 +75,7 @@
<ref bean="JetspeedDS" />
</constructor-arg>
<property name="enabled">
- <value type='boolean'>true</value>
+ <value type='boolean'>${portal.audit.enable}</value>
</property>
</bean>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml?rev=702497&r1=702496&r2=702497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml Tue Oct 7 07:45:13 2008
@@ -28,7 +28,7 @@
<ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
</constructor-arg>
<constructor-arg index="1">
- <value>/decorations</value>
+ <value>${portal.core.relative.decorations.path}</value>
</constructor-arg>
<constructor-arg index="2">
<ref bean="ResourceValidator" />
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties?rev=702497&r1=702496&r2=702497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties Tue Oct 7 07:45:13 2008
@@ -139,7 +139,6 @@
#--------------------------------------------------------------------
deployment.descriptor.mapping.xml=/WEB-INF/conf/portletdefinitionmapping.xml
-
#-------------------------------------------------------------------------
# C A P A B I L I T Y, C O N T E N T E N C O D I N G
#-------------------------------------------------------------------------
@@ -162,6 +161,8 @@
autodeployment.target.dir=${applicationRoot}/../
autodeployment.delay=10000
autodeployment.earlyInit = true
+autodeployment.apps.local.path=${autodeployment.staging.dir}/local
+autodeployment.apps.internal.path=${applicationRoot}/WEB-INF/apps
#-------------------------------------------------------------------------
# A S S E M B L Y (note may move this to class path)
@@ -173,7 +174,10 @@
#-------------------------------------------------------------------------
# Portal Core properties
#-------------------------------------------------------------------------
-portal.core.templates.path=/WEB-INF/templates/
+portal.core.templates.path=${applicationRoot}/WEB-INF/templates/
+portal.core.decorations.path=${applicationRoot}/decorations
+portal.core.relative.decorations.path=/decorations
+
#1 = Permissions = use Jetspeed Java Security Policy
#2 = Constraints = use Jetspeed (PageManager) Constraint-based Security
portal.core.security.type=2
@@ -190,6 +194,51 @@
portal.core.aggregator.worker.sparethreads=3
#Maximum number of jobs processed by a worker before being released
portal.core.aggregator.worker.maxjobsthreads=3
+#portal entity id ID Generator start value
+portal.core.id.generator.start=65536
+#portal entity id ID Prefix
+portal.core.id.prefix=P-
+
+#-------------------------------------------------------------------------
+# Jetspeed Statistics Implementation
+#-------------------------------------------------------------------------
+portal.statistics.logToLogger=false
+portal.statistics.logToDatabase=true
+# Number of records
+portal.statistics.MaxPortalRecordToFlush=300
+portal.statistics.MaxUserUserRecordToFlush=50
+portal.statistics.MaxPagePageRecordToFlush=100
+# Flush time in in Millisecond
+portal.statistics.MaxTimePortalToFlush=300000
+portal.statistics.MaxTimeUserToFlush=5000
+portal.statistics.MaxTimePageToFlush=60000
+
+#-------------------------------------------------------------------------
+# Castor page Manager
+#-------------------------------------------------------------------------
+castorXmlPageManager.permission=false
+castorXmlPageManager.constraints=false
+
+page.file.cache.scanRate=10
+page.file.cache.size=100
+
+dbPageManager.cache.size=128
+#- folder/page/link cache expires seconds, default=-1, infinite=0, min=30
+# (default is 150 seconds)
+dbPageManager.cache.expire=-1
+
+
+#-------------------------------------------------------------------------
+# Search Implementation
+#-------------------------------------------------------------------------
+# search Index location
+search.index.location=${applicationRoot}/WEB-INF/search_index
+search.index.optimizeAfterUpdate=true
+#-------------------------------------------------------------------------
+# Audit Implementation
+#-------------------------------------------------------------------------
+portal.audit.enable=true
+
#-------------------------------------------------------------------------
# E M A I L
#-------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org