Permalink
Browse files

This commit was manufactured by cvs2svn to create tag

'rel-2-5-1-RC1'.

git-svn-id: https://source.jasig.org/uPortal/tags/rel-2-5-1-RC1@10670 f5dbab47-78f9-eb45-b975-e544023573eb
  • Loading branch information...
infrastructure@lists.ja-sig.org
infrastructure@lists.ja-sig.org committed Sep 29, 2005
1 parent 057b647 commit 531dbfd633c97d7eb119353af19c556aa1dab303
Showing with 5,639 additions and 4,935 deletions.
  1. +3 −3 README
  2. +11 −1 build.properties
  3. +1 −1 build.xml
  4. +55 −0 etc/uportal-quickstart-dist.sh
  5. +64 −0 etc/uportal-source-dist.sh
  6. BIN lib/backport-util-concurrent.jar
  7. BIN lib/portlets/RenderCountPortlet.war
  8. +22 −0 properties/al/fragments.xml
  9. +11 −1 properties/applicationContext.xml
  10. +1 −0 properties/beanRefFactory.xml
  11. +48 −0 properties/chanpub/render-count-portlet.xml
  12. +33 −0 properties/chanpub/timetitle.xml
  13. +4 −4 properties/db/data.xml
  14. +15 −3 properties/personDirectory.xml
  15. +83 −0 properties/statsContext.xml
  16. +32 −291 releaseNotes.txt
  17. +0 −119 scripts/createTables-hypersonic.script
  18. +0 −15 scripts/dropTables.script
  19. +0 −269 scripts/populateTables.script
  20. +7 −0 source/org/jasig/portal/ChannelIncorporationFilter.java
  21. +93 −20 source/org/jasig/portal/ChannelManager.java
  22. +144 −27 source/org/jasig/portal/ChannelRenderer.java
  23. +6 −6 source/org/jasig/portal/ChannelRendererFactory.java
  24. +23 −1 source/org/jasig/portal/ChannelRuntimeData.java
  25. +51 −5 source/org/jasig/portal/ChannelRuntimeProperties.java
  26. +250 −61 source/org/jasig/portal/CharacterCachingChannelIncorporationFilter.java
  27. +1 −1 source/org/jasig/portal/DownloadDispatchWorker.java
  28. +1 −5 source/org/jasig/portal/GuestUserPreferencesManager.java
  29. +4 −1 source/org/jasig/portal/HttpProxyServlet.java
  30. +4 −1 source/org/jasig/portal/IChannel.java
  31. +25 −2 source/org/jasig/portal/MediaManager.java
  32. +0 −7 source/org/jasig/portal/PortalSessionManager.java
  33. +11 −5 source/org/jasig/portal/RDBMPortletPreferencesStore.java
  34. +73 −55 source/org/jasig/portal/RDBMServices.java
  35. +1 −3 source/org/jasig/portal/StandaloneChannelRenderer.java
  36. +28 −3 source/org/jasig/portal/StructureStylesheetUserPreferences.java
  37. +14 −1 source/org/jasig/portal/StylesheetUserPreferences.java
  38. +11 −0 source/org/jasig/portal/ThemeStylesheetUserPreferences.java
  39. +33 −31 source/org/jasig/portal/UserInstance.java
  40. +64 −2 source/org/jasig/portal/UserInstanceManager.java
  41. +7 −4 source/org/jasig/portal/UserPreferences.java
  42. +23 −80 source/org/jasig/portal/UserPreferencesManager.java
  43. +12 −1 source/org/jasig/portal/UserProfile.java
  44. +2 −2 source/org/jasig/portal/Version.java
  45. +1 −1 source/org/jasig/portal/car/ChannelDefinitionTagHandler.java
  46. +6 −6 source/org/jasig/portal/channels/CNumberGuess.java
  47. +101 −0 source/org/jasig/portal/channels/CTimeTitle.java
  48. +5 −1 source/org/jasig/portal/channels/DLMUserPreferences/TabColumnPrefsState.java
  49. +1 −1 source/org/jasig/portal/channels/cusermanager/CUserManager.java
  50. +7 −7 source/org/jasig/portal/channels/cusermanager/Constants.java
  51. +10 −10 source/org/jasig/portal/channels/cusermanager/provider/DefaultDataHandlerImpl.java
  52. +7 −7 source/org/jasig/portal/channels/error/CError.java
  53. +151 −121 source/org/jasig/portal/channels/portlet/CPortletAdapter.java
  54. +0 −3 source/org/jasig/portal/channels/portlet/ChannelData.java
  55. +41 −0 source/org/jasig/portal/channels/support/IChannelTitle.java
  56. +38 −0 source/org/jasig/portal/channels/support/IDynamicChannelTitleRenderer.java
  57. +44 −0 source/org/jasig/portal/channels/support/TitledChannelRuntimeProperties.java
  58. +11 −2 source/org/jasig/portal/channels/webproxy/CWebProxy.java
  59. +18 −1 source/org/jasig/portal/concurrency/caching/ReferenceEntityCache.java
  60. +25 −13 source/org/jasig/portal/concurrency/caching/ReferenceInvalidatingEntityCache.java
  61. +7 −3 source/org/jasig/portal/container/deploy/Deployer.java
  62. +4 −0 source/org/jasig/portal/container/om/entity/PortletEntityImpl.java
  63. +396 −364 source/org/jasig/portal/container/services/information/PortletStateManager.java
  64. +194 −0 source/org/jasig/portal/container/services/information/PortletWindowStateInfo.java
  65. +15 −2 source/org/jasig/portal/container/services/information/StaticInformationProviderImpl.java
  66. +13 −1 source/org/jasig/portal/container/services/property/PropertyManagerServiceImpl.java
  67. +87 −0 source/org/jasig/portal/container/servlet/PortletAttributeRequestWrapper.java
  68. +1 −1 source/org/jasig/portal/groups/PersonDirNameFinder.java
  69. +4 −3 source/org/jasig/portal/i18n/LocaleManager.java
  70. +5 −1 source/org/jasig/portal/jndi/JNDIManager.java
  71. +1 −1 source/org/jasig/portal/lang/Resources.java
  72. +8 −8 source/org/jasig/portal/lang/StackTrace.java
  73. +1 −1 source/org/jasig/portal/lang/ThrowableHelper.java
  74. +10 −5 source/org/jasig/portal/layout/alm/ALNode.java
  75. +67 −18 source/org/jasig/portal/layout/alm/AggregatedLayout.java
  76. +17 −1 source/org/jasig/portal/layout/alm/AggregatedLayoutManager.java
  77. +634 −321 source/org/jasig/portal/layout/alm/AggregatedUserLayoutStore.java
  78. +0 −2 source/org/jasig/portal/layout/dlm/ConfigurationLoader.java
  79. +0 −52 source/org/jasig/portal/layout/dlm/DistributedLayoutManager.java
  80. +40 −0 source/org/jasig/portal/layout/dlm/DistributedUserPreferences.java
  81. +0 −1 source/org/jasig/portal/layout/dlm/HandlerUtils.java
  82. +0 −3 source/org/jasig/portal/layout/dlm/ILFBuilder.java
  83. +0 −1 source/org/jasig/portal/layout/dlm/PLFIntegrator.java
  84. +18 −25 source/org/jasig/portal/layout/dlm/RDBMDistributedLayoutStore.java
  85. +0 −1 source/org/jasig/portal/layout/dlm/channels/guide/DlmIntroChannel.java
  86. +3 −0 source/org/jasig/portal/layout/node/UserLayoutChannelDescription.java
  87. +4 −0 source/org/jasig/portal/layout/node/UserLayoutNodeDescription.java
  88. +11 −8 source/org/jasig/portal/layout/restrictions/UserLayoutRestriction.java
  89. +5 −1 source/org/jasig/portal/layout/restrictions/alm/DepthRestriction.java
  90. +7 −5 source/org/jasig/portal/layout/simple/RDBMUserLayoutStore.java
  91. +1 −1 source/org/jasig/portal/rdbm/DatabaseMetaDataImpl.java
  92. +41 −5 source/org/jasig/portal/security/provider/RemoteUserPersonManager.java
  93. +9 −0 source/org/jasig/portal/security/provider/RemoteUserSecurityContext.java
  94. +4 −4 source/org/jasig/portal/serialize/BaseMarkupSerializer.java
  95. +21 −0 source/org/jasig/portal/serialize/CachingHTMLSerializer.java
  96. +22 −0 source/org/jasig/portal/serialize/CachingXHTMLSerializer.java
  97. +61 −79 source/org/jasig/portal/serialize/HTMLdtd.java
  98. +4 −34 source/org/jasig/portal/serialize/ProxyWriter.java
  99. +15 −7 source/org/jasig/portal/services/Authentication.java
  100. +156 −183 source/org/jasig/portal/services/StatsRecorder.java
  101. +1 −1 source/org/jasig/portal/services/persondir/support/legacy/PersonDirInfoAdaptor.java
  102. +5 −0 source/org/jasig/portal/services/stats/BaseStatsRecorder.java
  103. +281 −0 source/org/jasig/portal/services/stats/ConditionalStatsRecorder.java
  104. +1 −0 source/org/jasig/portal/services/stats/DoNothingStatsRecorder.java
  105. +8 −1 source/org/jasig/portal/services/stats/IStatsRecorderFactory.java
  106. +122 −0 source/org/jasig/portal/services/stats/IStatsRecorderFlags.java
  107. +120 −0 source/org/jasig/portal/services/stats/LegacyStatsRecorderFactory.java
  108. +475 −0 source/org/jasig/portal/services/stats/ListStatsRecorder.java
  109. +96 −0 source/org/jasig/portal/services/stats/SettingsBackedStatsRecorderFlagsImpl.java
  110. +341 −0 source/org/jasig/portal/services/stats/StatsRecorderFlagsImpl.java
  111. +29 −22 source/org/jasig/portal/services/stats/StatsRecorderSettings.java
  112. +200 −0 source/org/jasig/portal/services/stats/ThreadFiringStatsRecorder.java
  113. +9 −18 source/org/jasig/portal/tools/ChannelServlet.java
  114. +94 −43 source/org/jasig/portal/tools/checks/ChecksServlet.java
  115. +9 −1 source/org/jasig/portal/tools/dbloader/DbUnload.java
  116. +1 −1 source/org/jasig/portal/utils/SAX2BufferImpl.java
  117. +9 −0 source/org/jasig/portal/utils/SAX2DuplicatingFilterImpl.java
  118. +4 −0 source/org/jasig/portal/utils/SAX2FilterImpl.java
  119. +4 −3 source/org/jasig/portal/utils/SoftHashMap.java
  120. +24 −33 source/org/jasig/portal/utils/SqlTransaction.java
  121. +27 −10 source/org/jasig/portal/utils/SubstitutionIntegerFilter.java
  122. +10 −6 source/org/jasig/portal/utils/SubstitutionServletOutputStream.java
  123. +7 −4 source/org/jasig/portal/utils/SubstitutionWriter.java
  124. +1 −0 source/org/jasig/portal/utils/threading/PriorityThreadFactory.java
  125. +54 −0 tests/org/jasig/portal/container/services/information/StaticInformationProviderImplTest.java
  126. +7 −7 tests/org/jasig/portal/lang/ChainedThrowable_Test.java
  127. +1 −1 tests/org/jasig/portal/lang/Resources_Test.java
  128. +4 −4 webpages/dtd/channelPublishingDocument.dtd
  129. +3 −31 webpages/error.jsp
  130. +3 −31 webpages/index.jsp
  131. BIN webpages/media/org/jasig/portal/channels/CError/error_hide_trace.gif
  132. BIN webpages/media/org/jasig/portal/channels/CError/error_reboot.gif
  133. BIN webpages/media/org/jasig/portal/channels/CError/error_refresh.gif
  134. BIN webpages/media/org/jasig/portal/channels/CError/error_show_trace.gif
  135. BIN webpages/media/org/jasig/portal/channels/CError/transparent.gif
  136. BIN webpages/media/org/jasig/portal/channels/CError/wrenchworks.gif
  137. +8 −5 webpages/media/org/jasig/portal/channels/webproxy/CWebProxy.cpd
  138. +0 −6 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Entries
  139. +0 −1 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Repository
  140. +0 −1 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Root
  141. +0 −1 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_en_US.xsl
  142. +0 −14 webpages/stylesheets/org/jasig/portal/channels/CError/CError.ssl
  143. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly.xsl
  144. +0 −13 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly.xsl.de_DE.dict
  145. +0 −13 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly.xsl.en_US.dict
  146. +0 −13 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly.xsl.it_IT.dict
  147. +0 −13 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly.xsl.ja_JP.dict
  148. +0 −13 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly.xsl.sv_SE.dict
  149. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly_de_DE.xsl
  150. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly_en_US.xsl
  151. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly_it_IT.xsl
  152. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly_ja_JP.xsl
  153. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly_lv_LV.xsl
  154. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly_sv_SE.xsl
  155. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full.xsl
  156. +0 −33 webpages/stylesheets/org/jasig/portal/channels/CError/html_full.xsl.de_DE.dict
  157. +0 −33 webpages/stylesheets/org/jasig/portal/channels/CError/html_full.xsl.en_US.dict
  158. +0 −33 webpages/stylesheets/org/jasig/portal/channels/CError/html_full.xsl.it_IT.dict
  159. +0 −33 webpages/stylesheets/org/jasig/portal/channels/CError/html_full.xsl.ja_JP.dict
  160. +0 −33 webpages/stylesheets/org/jasig/portal/channels/CError/html_full.xsl.sv_SE.dict
  161. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_de_DE.xsl
  162. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_en_US.xsl
  163. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_it_IT.xsl
  164. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_ja_JP.xsl
  165. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_lv_LV.xsl
  166. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_sv_SE.xsl
  167. +0 −148 webpages/stylesheets/org/jasig/portal/channels/CError/wml.xsl
  168. +17 −17 webpages/stylesheets/org/jasig/portal/channels/CSnoop/CSnoop.xsl
  169. +21 −0 webpages/stylesheets/org/jasig/portal/channels/CTimeTitle/CTimeTitle.xsl
  170. +18 −1 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes.xsl
  171. +2 −2 webpages/stylesheets/org/jasig/portal/layout/DLM-tab-column/nested-tables/nested-tables.xsl
View
6 README
@@ -14,13 +14,13 @@ clean build directories and publish the uPortal build into a configured Tomcat i
accidentally run the build such that it overwrites a uPortal instance you care about. Locations affected by
the build are declared in build.properties.
-
+Backup your work before running builds.
Manifest
----------------------------------------
build.properties o Contains configuration for the build file that needs to
be customized for your environment.
-build.xml o Contains the ant build targets for working with uPortal.
+build.xml o Contains the Ant build targets for working with uPortal.
Ant Depdency
----------------------------------------
@@ -62,7 +62,7 @@ version of the portal is configured.
Logging
---------------------------------------
-The ant build moves /properties/Logger.properties to the root of the classes directory so that the resulting
+The ant build copies /properties/Logger.properties to the root of the classes directory so that the resulting
log4j.properties file will be available on the classpath for Commons Logging / log4j to find. You'll need to either
change that configuration in Logger.properties before the build or to change it in /WEB-INF/classes/ afterwards.
You can configure the logging level, where the file should be, or even choose a different logging approach (log
View
@@ -15,7 +15,7 @@
#==================== File and Directory Names ========================
app.name=uPortal
-app.version=2.5.0-RC3
+app.version=2.5.1_RC1
lib.path=lib
server.home=/JavaClasses/jakarta-tomcat-5.0.28
@@ -35,6 +35,16 @@ deploy.home=${server.home}/webapps/${webapp.docBase}
webapp.contextFile=uPortal.xml
# prototype context file for use with Tomcat 5.5
+#
+# Note that if you use this context file to declare one or more DataSources you would like
+# the Tomcat 5.5 servlet container to instantiate and make available to uPortal via JNDI,
+# you also need to make the .jar files implementing those datasources available to
+# Tomcat 5.5 by installing them into the /common/lib directory of your Tomcat 5.5 instance.
+# Without the required .jar(s), Tomcat will be unable to instantiate the DataSource.
+#
+# The build.xml build process does not currently install the database driver jar
+# (Declared as jdbcDriver.jar below) into Tomcat 5.5 /common/lib. You will need to do this manually.
+#
#webapp.contextFile=uPortal55.xml
#==================== Compilation Control Options =====================
View
@@ -1346,7 +1346,7 @@
<target name="pubchan" description="Publishes channels" depends="compile">
<echo message="Invoking Channel Publisher Tool"/>
- <property name="channel" value=" "/>
+ <property name="channel" value="all"/>
<java fork="true" failonerror="true" dir="${basedir}" classname="org.jasig.portal.tools.chanpub.ChannelPublisher">
<classpath>
<pathelement path="${build.home}/WEB-INF/classes"/>
@@ -0,0 +1,55 @@
+#!/bin/bash
+#
+# $Id$
+# This script will package up a uPortal quickstart distribution
+#
+
+if [ -z "$3" ]; then
+ echo usage: $0 release-tag uportal-src-dir old-quickstart-dir
+ exit
+fi
+
+RELEASE=uPortal_$1-quick-start
+SRC=$2
+QSDIR=$3
+
+#
+# Create root dir for quick-start distribution
+#
+echo $RELEASE
+mkdir $RELEASE
+cd $RELEASE
+
+#
+# Move in uPortal source distribution and quickstart scripts
+#
+#
+cp -r $SRC .
+cp $SRC/etc/quickstart/* .
+
+#
+# Move in quickstart resources from previously release
+# (is there a better way to do a quickstart?)
+#
+cp -r $QSDIR/Ant_1-6-2 .
+cp -r $QSDIR/HSQLDB_1-7-2-4 .
+cp -r $QSDIR/Tomcat_5-0-28 .
+
+
+echo "done!"
+echo "Now..."
+echo "update server.home in uPortal build.properties"
+echo "start hsqldb - ant hsql"
+echo "set getDatasourceFromJNDI in portal.properties to true
+echo "run ant deploy in uPortal home"
+echo "start tomcat, ant tomcatstart, and check for no errors in portal.log"
+echo "stop HSQL and Tomcat"
+echo "rm uPortal/build, and Tomcat work and logs, and portal.log"
+echo "run fix-unix-modes.sh"
+echo "zip -r uPortal_X-X-X-quick-start uPortal_X-X-X-quick-start"
+echo ""
+echo "scp the release to www.jasig.org:/var/www/html/ja-sig/uportaldist"
+echo "update download.html page."
+echo "update cvs.html page."
+echo "update index.html with news about releases."
+exit
View
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+#
+# $Id$
+# This script will package up a uPortal source distribution
+#
+
+
+if [ -z "$1" ]; then
+ echo usage: $0 release-tag
+ exit
+fi
+
+#
+# Export release tag
+#
+cvs -d:pserver:anonymous@mis105.mis.udel.edu:/home/cvs/jasig login
+cvs -d:pserver:anonymous@mis105.mis.udel.edu:/home/cvs/jasig export -r $1 portal
+
+#
+# Remove website directory, build.xml and README in ./docs
+# These are used to maintain the website and are not
+# needed in the distribution. Is there a better place for these?
+#
+rm -rf ./portal/docs/website
+rm ./portal/docs/build.xml
+rm ./portal/docs/README
+
+#
+# Remove .cvsignore files.
+#
+find . -name ".cvsignore" | xargs rm
+
+#
+# Remove .dict files. (should these be moved to the attic?)
+#
+find . -name "*.dict" | xargs rm
+
+#
+# Create JavaDoc
+#
+cd portal
+ant javadoc
+mv ./dist/docs/api ./docs/
+ant clean
+cd ../
+
+#
+# Rename model to uPortal_{release-tag}
+#
+mv portal uPortal_$1
+
+#
+# Zip up distribution
+#
+zip -r uPortal_$1 uPortal_$1
+
+echo "done!"
+echo "Now..."
+echo "scp the release to www.jasig.org:/var/www/html/ja-sig/uportaldist"
+echo "update download.html page."
+echo "update cvs.html page."
+echo "update index.html with news about releases."
+exit
Binary file not shown.
Binary file not shown.
@@ -110,16 +110,38 @@
<channel fname="missing-properties" immutable="Y" unremovable="Y" hidden="N"/>
<channel fname="person-attributes" immutable="Y" unremovable="Y" hidden="N"/>
<channel fname="css-viewer" immutable="Y" unremovable="Y" hidden="N"/>
+
</folder>
<folder name="column2" immutable="Y" unremovable="Y" hidden="N">
<channel fname="snooper" immutable="Y" unremovable="Y" hidden="N"/>
<channel fname="uportal-development-books" immutable="Y" unremovable="Y" hidden="N"/>
<channel fname="uportal-data-dictionary" immutable="Y" unremovable="Y" hidden="N"/>
<channel fname="uportal-developers-reference" immutable="Y" unremovable="Y" hidden="N"/>
+
</folder>
</folder>
</fragment>
+ <fragment name="dynamicTitles" type="pushed">
+ <description>Demonstrates dynamic title feature.</description>
+ <groups>
+ <group>Everyone</group>
+ <group>Guests</group>
+ </groups>
+ <restrictions>
+ <restriction path="local" name="priority" value="1000-2000"/>
+ <restriction path="local" name="depth" value="1"/>
+ </restrictions>
+ <folder name="Dynamic Titles" immutable="Y" unremovable="Y" hidden="N">
+ <folder name="column1" immutable="Y" unremovable="Y" hidden="N">
+ <channel fname="timetitle" immutable="Y" unremovable="Y" hidden="N"/>
+ </folder>
+ <folder name="column2" immutable="Y" unremovable="Y" hidden="N">
+ <channel fname="render-count-portlet" immutable="Y" unremovable="Y" hidden="N"/>
+ </folder>
+ </folder>
+ </fragment>
+
<fragment name="Portlet-examples" type="pushed">
<description>Channels that demonstrate the portlet adapter</description>
<groups>
@@ -11,8 +11,18 @@
| Here we define additional startup checks. These are in addition to hard-coded checks that
| are intended to detect problems that would prevent us from reading in and using these
| configurable checks.
+ |
+ | This bean is lazy-init so that it will not be instantiated by Spring
+ | unless actually needed. This reduces the chance that a broken checks
+ | configuration, or one that depends on resources that are unavailable
+ | (such as JNDI resources outside the context of a JNDI container)
+ | will not break the use of a uPortal administrative tool / break a
+ | uPortal deployment.
+ |
+-->
- <bean id='checkRunner' class="org.jasig.portal.tools.checks.BasicCheckRunner">
+ <bean id='checkRunner'
+ class="org.jasig.portal.tools.checks.BasicCheckRunner"
+ lazy-init="true">
<property name="checks">
<list>
@@ -22,6 +22,7 @@
<value>properties/applicationContext.xml</value>
<value>properties/cacheContext.xml</value>
<!--
+ <value>properties/statsContext.xml</value>
<value>properties/jmxContext.xml</value>
-->
</list>
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE channel-definition SYSTEM "channelDefinition.dtd">
+
+<!--
+ | This channel publishing fragment defines a channel for the
+ | Render Count portlet, an example JSR-168 that exercises the
+ | dynamic portlet title feature.
+ +-->
+
+<channel-definition>
+
+ <title>Render Count Portlet</title>
+ <name>Render Count Portlet</name>
+ <fname>render-count-portlet</fname>
+ <desc>Demonstrates dynamic portlet titles.</desc>
+ <type>Portlet</type>
+ <class>org.jasig.portal.channels.portlet.CPortletAdapter</class>
+ <timeout>60000</timeout>
+
+ <hasedit>N</hasedit>
+ <hashelp>N</hashelp>
+ <hasabout>N</hasabout>
+
+ <secure>N</secure>
+ <locale>en_US</locale>
+
+ <categories>
+ <category>Development</category>
+ </categories>
+
+ <groups>
+ <group>Everyone</group>
+ </groups>
+
+ <parameters>
+
+ <!-- The syntax of the ID is [portlet-context-name].[portlet-name] -->
+ <parameter>
+ <name>portletDefinitionId</name>
+ <value>RenderCountPortlet.RenderCount</value>
+ <description>Identifies the portlet deployed within the portlet container</description>
+ <ovrd>N</ovrd>
+ </parameter>
+
+ </parameters>
+
+</channel-definition>
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE channel-definition SYSTEM "channelDefinition.dtd">
+
+<channel-definition>
+
+ <title>Dynamic Time Channel Title</title>
+ <name>Dynamic Time Channel Title</name>
+ <fname>timetitle</fname>
+ <desc>Channel for testing support for dynamic channel titles.</desc>
+ <type>Custom</type>
+ <class>org.jasig.portal.channels.CTimeTitle</class>
+ <timeout>5000</timeout>
+
+ <hasedit>N</hasedit>
+ <hashelp>N</hashelp>
+ <hasabout>N</hasabout>
+
+ <secure>N</secure>
+ <locale>en_US</locale>
+
+ <categories>
+ <category>Development</category>
+ </categories>
+
+ <groups>
+ <group>Everyone</group>
+ <group>Guests</group>
+ </groups>
+
+ <parameters/>
+
+</channel-definition>
View
@@ -10,7 +10,7 @@
<column><name>FNAME</name><value>UP_FRAMEWORK</value></column>
<column><name>MAJOR</name><value>2</value></column>
<column><name>MINOR</name><value>5</value></column>
- <column><name>MICRO</name><value>0</value></column>
+ <column><name>MICRO</name><value>1</value></column>
<column><name>DESCRIPTION</name><value>The uPortal Framework.</value></column>
</row>
</rows>
@@ -1104,7 +1104,7 @@
<column><name>CHAN_TITLE</name><value>Session Locale Selector</value></column>
<column><name>CHAN_NAME</name><value>Session Locale Selector</value></column>
<column><name>CHAN_DESC</name><value>A tool for selecting a locale</value></column>
- <column><name>CHAN_CLASS</name><value>org.jasig.portal.channels.layout.locales.CSessionLocalesSelector</value></column>
+ <column><name>CHAN_CLASS</name><value>org.jasig.portal.layout.channels.locales.CSessionLocalesSelector</value></column>
<column><name>CHAN_TYPE_ID</name><value>-1</value></column>
<column><name>CHAN_PUBL_ID</name><value>0</value></column>
<column><name>CHAN_PUBL_DT</name><value>SYSDATE</value></column>
@@ -3853,8 +3853,8 @@
<column><name>PROFILE_NAME</name><value>HTML browser profile</value></column>
<column><name>DESCRIPTION</name><value>A sample profile for common web browsers</value></column>
<column><name>LAYOUT_ID</name><value>1</value></column>
- <column><name>STRUCTURE_SS_ID</name>4</column>
- <column><name>THEME_SS_ID</name>3</column>
+ <column><name>STRUCTURE_SS_ID</name><value>4</value></column>
+ <column><name>THEME_SS_ID</name><value>3</value></column>
</row>
</rows>
</table>
@@ -60,9 +60,21 @@
PersonDirectory acquires when it asks for the bean of that name.
-->
- <!-- Legacy Person Directory configruation. This will read the config from PersonDirs.xml
- and otherwise emulate pre-2.5 PersonDirectory behavior. -->
- <bean id="personAttributeDao" class="org.jasig.portal.services.persondir.support.legacy.LegacyPersonAttributeDao"/>
+ <!--
+ | Legacy Person Directory configruation. This will read the config from PersonDirs.xml
+ | and otherwise emulate pre-2.5 PersonDirectory behavior.
+ |
+ | This bean is marked lazy-init="true" so that Spring will not eagerly
+ | initialize this bean when the PortalApplicationContextFacade is touched.
+ | This avoids unnecessarily building the instantiating the PersonAttributeDao i
+ | mplementation where it is not being used and where it may not have the
+ | resources it needs to be used, e.g. when running outside the context of
+ | a JNDI container.
+ |
+ +-->
+ <bean id="personAttributeDao"
+ class="org.jasig.portal.services.persondir.support.legacy.LegacyPersonAttributeDao"
+ lazy-init="true" />
<!--
| Example Person Directory configuration using the Spring implementation,
Oops, something went wrong.

0 comments on commit 531dbfd

Please sign in to comment.