Permalink
Browse files

This commit was manufactured by cvs2svn to create tag

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

git-svn-id: https://source.jasig.org/uPortal/tags/rel-2-5-2-RC1@11021 f5dbab47-78f9-eb45-b975-e544023573eb
  • Loading branch information...
1 parent 057b647 commit c0a22caf701f5512cf115e1545f8bdf9a6eed021 infrastructure@lists.ja-sig.org committed Feb 7, 2006
Showing with 15,927 additions and 10,711 deletions.
  1. +3 −3 README
  2. +12 −1 build.properties
  3. +19 −3 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/casclient-2.1.1.jar
  8. +166 −0 lib/clover/clover.license
  9. BIN lib/portlets/RenderCountPortlet.war
  10. +29 −0 license.txt
  11. +39 −0 maven.xml
  12. +48 −0 project.properties
  13. +529 −0 project.xml
  14. +2 −2 properties/PersonDirs.xml
  15. +0 −9 properties/al/al.properties
  16. +41 −0 properties/al/fragments.xml
  17. +11 −1 properties/applicationContext.xml
  18. +1 −0 properties/beanRefFactory.xml
  19. +48 −0 properties/chanpub/render-count-portlet.xml
  20. +33 −0 properties/chanpub/timetitle.xml
  21. +90 −0 properties/chanpub/wsrp-library-search.xml
  22. +4 −4 properties/db/data.xml
  23. +12 −0 properties/db/dbloader.xml
  24. +2 −1 properties/db/tables.xml
  25. +23 −5 properties/personDirectory.xml
  26. +35 −0 properties/security.properties
  27. +83 −0 properties/statsContext.xml
  28. +23 −0 properties/whirlycache.xml
  29. +59 −288 releaseNotes.txt
  30. +0 −119 scripts/createTables-hypersonic.script
  31. +0 −15 scripts/dropTables.script
  32. +0 −269 scripts/populateTables.script
  33. +93 −80 source/org/jasig/portal/ChannelFactory.java
  34. +7 −0 source/org/jasig/portal/ChannelIncorporationFilter.java
  35. +98 −21 source/org/jasig/portal/ChannelManager.java
  36. +163 −27 source/org/jasig/portal/ChannelRenderer.java
  37. +6 −6 source/org/jasig/portal/ChannelRendererFactory.java
  38. +23 −1 source/org/jasig/portal/ChannelRuntimeData.java
  39. +51 −5 source/org/jasig/portal/ChannelRuntimeProperties.java
  40. +10 −0 source/org/jasig/portal/ChannelStaticData.java
  41. +250 −61 source/org/jasig/portal/CharacterCachingChannelIncorporationFilter.java
  42. +1 −1 source/org/jasig/portal/DownloadDispatchWorker.java
  43. +1 −5 source/org/jasig/portal/GuestUserPreferencesManager.java
  44. +4 −1 source/org/jasig/portal/HttpProxyServlet.java
  45. +4 −1 source/org/jasig/portal/IChannel.java
  46. +3 −1 source/org/jasig/portal/IMultithreadedCacheable.java
  47. +3 −0 source/org/jasig/portal/IMultithreadedChannel.java
  48. +3 −0 source/org/jasig/portal/IMultithreadedCharacterChannel.java
  49. +4 −0 source/org/jasig/portal/IMultithreadedDirectResponse.java
  50. +3 −0 source/org/jasig/portal/IMultithreadedMimeResponse.java
  51. +3 −0 source/org/jasig/portal/IMultithreadedPrivileged.java
  52. +10 −1 source/org/jasig/portal/LoginServlet.java
  53. +10 −1 source/org/jasig/portal/LogoutServlet.java
  54. +25 −2 source/org/jasig/portal/MediaManager.java
  55. +0 −7 source/org/jasig/portal/PortalSessionManager.java
  56. +11 −5 source/org/jasig/portal/RDBMPortletPreferencesStore.java
  57. +73 −57 source/org/jasig/portal/RDBMServices.java
  58. +5 −2 source/org/jasig/portal/ReferenceSequenceGenerator.java
  59. +1 −3 source/org/jasig/portal/StandaloneChannelRenderer.java
  60. +28 −3 source/org/jasig/portal/StructureStylesheetUserPreferences.java
  61. +14 −1 source/org/jasig/portal/StylesheetUserPreferences.java
  62. +11 −0 source/org/jasig/portal/ThemeStylesheetUserPreferences.java
  63. +38 −44 source/org/jasig/portal/UserInstance.java
  64. +64 −2 source/org/jasig/portal/UserInstanceManager.java
  65. +7 −4 source/org/jasig/portal/UserPreferences.java
  66. +43 −101 source/org/jasig/portal/UserPreferencesManager.java
  67. +12 −1 source/org/jasig/portal/UserProfile.java
  68. +25 −4 source/org/jasig/portal/Version.java
  69. +1 −1 source/org/jasig/portal/car/ChannelDefinitionTagHandler.java
  70. +4 −0 source/org/jasig/portal/channels/BaseChannel.java
  71. +127 −35 source/org/jasig/portal/channels/CGenericXSLT.java
  72. +6 −6 source/org/jasig/portal/channels/CNumberGuess.java
  73. +101 −0 source/org/jasig/portal/channels/CTimeTitle.java
  74. +5 −1 source/org/jasig/portal/channels/DLMUserPreferences/TabColumnPrefsState.java
  75. +1 −1 source/org/jasig/portal/channels/cusermanager/CUserManager.java
  76. +7 −7 source/org/jasig/portal/channels/cusermanager/Constants.java
  77. +11 −11 source/org/jasig/portal/channels/cusermanager/provider/DefaultDataHandlerImpl.java
  78. +7 −7 source/org/jasig/portal/channels/error/CError.java
  79. +24 −3 source/org/jasig/portal/channels/groupsmanager/CGroupsManagerServantFactory.java
  80. +41 −14 ...rg/jasig/portal/channels/groupsmanager/permissions/GroupsManagerBlockEntitySelectPermissions.java
  81. +156 −130 source/org/jasig/portal/channels/portlet/CPortletAdapter.java
  82. +0 −3 source/org/jasig/portal/channels/portlet/ChannelData.java
  83. +41 −0 source/org/jasig/portal/channels/support/IChannelTitle.java
  84. +38 −0 source/org/jasig/portal/channels/support/IDynamicChannelTitleRenderer.java
  85. +44 −0 source/org/jasig/portal/channels/support/TitledChannelRuntimeProperties.java
  86. +254 −81 source/org/jasig/portal/channels/webproxy/CWebProxy.java
  87. +18 −1 source/org/jasig/portal/concurrency/caching/ReferenceEntityCache.java
  88. +25 −13 source/org/jasig/portal/concurrency/caching/ReferenceInvalidatingEntityCache.java
  89. +7 −3 source/org/jasig/portal/container/deploy/Deployer.java
  90. +4 −0 source/org/jasig/portal/container/om/entity/PortletEntityImpl.java
  91. +396 −364 source/org/jasig/portal/container/services/information/PortletStateManager.java
  92. +194 −0 source/org/jasig/portal/container/services/information/PortletWindowStateInfo.java
  93. +15 −2 source/org/jasig/portal/container/services/information/StaticInformationProviderImpl.java
  94. +13 −1 source/org/jasig/portal/container/services/property/PropertyManagerServiceImpl.java
  95. +87 −0 source/org/jasig/portal/container/servlet/PortletAttributeRequestWrapper.java
  96. +1 −1 source/org/jasig/portal/groups/PersonDirNameFinder.java
  97. +4 −3 source/org/jasig/portal/i18n/LocaleManager.java
  98. +6 −2 source/org/jasig/portal/jndi/JNDIManager.java
  99. +40 −37 source/org/jasig/portal/jndi/PortalInitialContextFactory.java
  100. +1 −1 source/org/jasig/portal/lang/Resources.java
  101. +8 −8 source/org/jasig/portal/lang/StackTrace.java
  102. +1 −1 source/org/jasig/portal/lang/ThrowableHelper.java
  103. +10 −5 source/org/jasig/portal/layout/alm/ALNode.java
  104. +662 −614 source/org/jasig/portal/layout/alm/AggregatedLayout.java
  105. +1,396 −1,443 source/org/jasig/portal/layout/alm/AggregatedLayoutManager.java
  106. +3,273 −3,278 source/org/jasig/portal/layout/alm/AggregatedUserLayoutStore.java
  107. +3 −1 source/org/jasig/portal/layout/alm/IALNodeDescription.java
  108. +20 −13 source/org/jasig/portal/layout/alm/channels/CFragmentManager.java
  109. +0 −29 source/org/jasig/portal/layout/alm/tool/FragmentLoader.java
  110. +0 −2 source/org/jasig/portal/layout/dlm/ConfigurationLoader.java
  111. +0 −52 source/org/jasig/portal/layout/dlm/DistributedLayoutManager.java
  112. +40 −0 source/org/jasig/portal/layout/dlm/DistributedUserPreferences.java
  113. +0 −1 source/org/jasig/portal/layout/dlm/HandlerUtils.java
  114. +0 −3 source/org/jasig/portal/layout/dlm/ILFBuilder.java
  115. +0 −1 source/org/jasig/portal/layout/dlm/PLFIntegrator.java
  116. +39 −36 source/org/jasig/portal/layout/dlm/RDBMDistributedLayoutStore.java
  117. +0 −1 source/org/jasig/portal/layout/dlm/channels/guide/DlmIntroChannel.java
  118. +43 −3 source/org/jasig/portal/layout/dlm/providers/GroupMembershipEvaluator.java
  119. +5 −2 source/org/jasig/portal/layout/node/UserLayoutChannelDescription.java
  120. +4 −0 source/org/jasig/portal/layout/node/UserLayoutNodeDescription.java
  121. +11 −8 source/org/jasig/portal/layout/restrictions/UserLayoutRestriction.java
  122. +5 −1 source/org/jasig/portal/layout/restrictions/alm/DepthRestriction.java
  123. +56 −38 source/org/jasig/portal/layout/simple/RDBMUserLayoutStore.java
  124. +1 −1 source/org/jasig/portal/rdbm/DatabaseMetaDataImpl.java
  125. +0 −3 source/org/jasig/portal/rdbm/pool/PooledDataSourceFactoryFactory.java
  126. +4 −0 source/org/jasig/portal/security/LocalConnectionContext.java
  127. +61 −0 source/org/jasig/portal/security/provider/BrokenSecurityContext.java
  128. +1 −1 source/org/jasig/portal/security/provider/ChainingSecurityContext.java
  129. +1 −0 source/org/jasig/portal/security/provider/PersonImpl.java
  130. +41 −5 source/org/jasig/portal/security/provider/RemoteUserPersonManager.java
  131. +9 −0 source/org/jasig/portal/security/provider/RemoteUserSecurityContext.java
  132. +199 −0 source/org/jasig/portal/security/provider/cas/CasConnectionContext.java
  133. +128 −0 source/org/jasig/portal/security/provider/cas/CasFilteredSecurityContext.java
  134. +22 −0 source/org/jasig/portal/security/provider/cas/CasFilteredSecurityContextFactory.java
  135. +130 −0 source/org/jasig/portal/security/provider/cas/CasProxyTicketAcquisitionException.java
  136. +207 −0 source/org/jasig/portal/security/provider/cas/CasSecurityContext.java
  137. +145 −0 source/org/jasig/portal/security/provider/cas/CasSecurityContextFactory.java
  138. +38 −0 source/org/jasig/portal/security/provider/cas/ICasSecurityContext.java
  139. +4 −4 source/org/jasig/portal/serialize/BaseMarkupSerializer.java
  140. +21 −0 source/org/jasig/portal/serialize/CachingHTMLSerializer.java
  141. +22 −0 source/org/jasig/portal/serialize/CachingXHTMLSerializer.java
  142. +61 −79 source/org/jasig/portal/serialize/HTMLdtd.java
  143. +4 −34 source/org/jasig/portal/serialize/ProxyWriter.java
  144. +15 −7 source/org/jasig/portal/services/Authentication.java
  145. +6 −3 source/org/jasig/portal/services/GroupService.java
  146. +156 −183 source/org/jasig/portal/services/StatsRecorder.java
  147. +265 −0 source/org/jasig/portal/services/persondir/support/CachingPersonAttributeDaoImpl.java
  148. +1 −1 source/org/jasig/portal/services/persondir/support/legacy/PersonDirInfoAdaptor.java
  149. +5 −0 source/org/jasig/portal/services/stats/BaseStatsRecorder.java
  150. +281 −0 source/org/jasig/portal/services/stats/ConditionalStatsRecorder.java
  151. +1 −0 source/org/jasig/portal/services/stats/DoNothingStatsRecorder.java
  152. +8 −1 source/org/jasig/portal/services/stats/IStatsRecorderFactory.java
  153. +122 −0 source/org/jasig/portal/services/stats/IStatsRecorderFlags.java
  154. +120 −0 source/org/jasig/portal/services/stats/LegacyStatsRecorderFactory.java
  155. +475 −0 source/org/jasig/portal/services/stats/ListStatsRecorder.java
  156. +96 −0 source/org/jasig/portal/services/stats/SettingsBackedStatsRecorderFlagsImpl.java
  157. +341 −0 source/org/jasig/portal/services/stats/StatsRecorderFlagsImpl.java
  158. +29 −22 source/org/jasig/portal/services/stats/StatsRecorderSettings.java
  159. +200 −0 source/org/jasig/portal/services/stats/ThreadFiringStatsRecorder.java
  160. +9 −18 source/org/jasig/portal/tools/ChannelServlet.java
  161. +94 −43 source/org/jasig/portal/tools/checks/ChecksServlet.java
  162. +1 −1 source/org/jasig/portal/tools/dbloader/Configuration.java
  163. +9 −1 source/org/jasig/portal/tools/dbloader/DbUnload.java
  164. +1 −1 source/org/jasig/portal/utils/SAX2BufferImpl.java
  165. +9 −0 source/org/jasig/portal/utils/SAX2DuplicatingFilterImpl.java
  166. +4 −0 source/org/jasig/portal/utils/SAX2FilterImpl.java
  167. +13 −3 source/org/jasig/portal/utils/SoftHashMap.java
  168. +24 −33 source/org/jasig/portal/utils/SqlTransaction.java
  169. +27 −10 source/org/jasig/portal/utils/SubstitutionIntegerFilter.java
  170. +10 −6 source/org/jasig/portal/utils/SubstitutionServletOutputStream.java
  171. +7 −4 source/org/jasig/portal/utils/SubstitutionWriter.java
  172. +1 −1 source/org/jasig/portal/utils/XSLT.java
  173. +3 −0 source/org/jasig/portal/utils/cache/CacheFactory.java
  174. +28 −5 source/org/jasig/portal/utils/cache/WhirlyCacheCacheFactory.java
  175. +1 −0 source/org/jasig/portal/utils/threading/PriorityThreadFactory.java
  176. +76 −0 source/org/jasig/portal/utils/uri/BlockedUriException.java
  177. +30 −0 source/org/jasig/portal/utils/uri/IUriScrutinizer.java
  178. +208 −0 source/org/jasig/portal/utils/uri/PrefixUriScrutinizer.java
  179. +26 −0 tests/org/jasig/portal/channels/support/TitledChannelRuntimePropertiesTest.java
  180. +54 −0 tests/org/jasig/portal/container/services/information/StaticInformationProviderImplTest.java
  181. +7 −7 tests/org/jasig/portal/lang/ChainedThrowable_Test.java
  182. +1 −1 tests/org/jasig/portal/lang/Resources_Test.java
  183. +332 −0 tests/org/jasig/portal/security/provider/cas/CasConnectionContextTest.java
  184. +179 −0 tests/org/jasig/portal/security/provider/cas/CasSecurityContextMock.java
  185. +105 −0 tests/org/jasig/portal/security/provider/cas/CasSecurityContextMockTest.java
  186. +168 −0 tests/org/jasig/portal/services/persondir/support/CachingPersonAttributeDaoTest.java
  187. +351 −0 tests/org/jasig/portal/services/stats/ConditionalStatsRecorderTest.java
  188. +214 −0 tests/org/jasig/portal/services/stats/MockStatsRecorder.java
  189. +31 −0 tests/org/jasig/portal/utils/uri/BlockedUriExceptionTest.java
  190. +325 −0 tests/org/jasig/portal/utils/uri/PrefixUriScrutinizerTest.java
  191. +4 −4 webpages/dtd/channelPublishingDocument.dtd
  192. +3 −31 webpages/error.jsp
  193. +3 −31 webpages/index.jsp
  194. BIN webpages/media/org/jasig/portal/channels/CError/error_hide_trace.gif
  195. BIN webpages/media/org/jasig/portal/channels/CError/error_reboot.gif
  196. BIN webpages/media/org/jasig/portal/channels/CError/error_refresh.gif
  197. BIN webpages/media/org/jasig/portal/channels/CError/error_show_trace.gif
  198. BIN webpages/media/org/jasig/portal/channels/CError/transparent.gif
  199. BIN webpages/media/org/jasig/portal/channels/CError/wrenchworks.gif
  200. +107 −2 webpages/media/org/jasig/portal/channels/CGenericXSLT/CGenericJustXSLT.cpd
  201. +111 −1 webpages/media/org/jasig/portal/channels/CGenericXSLT/CGenericXSLT.cpd
  202. +98 −2 webpages/media/org/jasig/portal/channels/CGenericXSLT/RSS/RSS.cpd
  203. +76 −7 webpages/media/org/jasig/portal/channels/webproxy/CWebProxy.cpd
  204. +0 −6 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Entries
  205. +0 −1 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Repository
  206. +0 −1 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Root
  207. +11 −1 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html.xsl
  208. +11 −1 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_de_DE.xsl
  209. +11 −2 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_en_US.xsl
  210. +11 −1 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_it_IT.xsl
  211. +11 −1 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_ja_JP.xsl
  212. +11 −1 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_lv_LV.xsl
  213. +11 −1 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_sv_SE.xsl
  214. +0 −326 webpages/stylesheets/org/jasig/portal/channels/CContentSubscriber/contentSubscriber.xsl
  215. +12 −2 webpages/stylesheets/org/jasig/portal/channels/CContentSubscriber/html.xsl
  216. +0 −14 webpages/stylesheets/org/jasig/portal/channels/CError/CError.ssl
  217. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly.xsl
  218. +0 −13 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly.xsl.de_DE.dict
  219. +0 −13 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly.xsl.en_US.dict
  220. +0 −13 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly.xsl.it_IT.dict
  221. +0 −13 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly.xsl.ja_JP.dict
  222. +0 −13 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly.xsl.sv_SE.dict
  223. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly_de_DE.xsl
  224. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly_en_US.xsl
  225. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly_it_IT.xsl
  226. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly_ja_JP.xsl
  227. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly_lv_LV.xsl
  228. +0 −56 webpages/stylesheets/org/jasig/portal/channels/CError/html_friendly_sv_SE.xsl
  229. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full.xsl
  230. +0 −33 webpages/stylesheets/org/jasig/portal/channels/CError/html_full.xsl.de_DE.dict
  231. +0 −33 webpages/stylesheets/org/jasig/portal/channels/CError/html_full.xsl.en_US.dict
  232. +0 −33 webpages/stylesheets/org/jasig/portal/channels/CError/html_full.xsl.it_IT.dict
  233. +0 −33 webpages/stylesheets/org/jasig/portal/channels/CError/html_full.xsl.ja_JP.dict
  234. +0 −33 webpages/stylesheets/org/jasig/portal/channels/CError/html_full.xsl.sv_SE.dict
  235. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_de_DE.xsl
  236. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_en_US.xsl
  237. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_it_IT.xsl
  238. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_ja_JP.xsl
  239. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_lv_LV.xsl
  240. +0 −222 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_sv_SE.xsl
  241. +0 −148 webpages/stylesheets/org/jasig/portal/channels/CError/wml.xsl
  242. +2 −2 webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/uPortalDevBooks/uPortalDevBooks.ssl
  243. +17 −17 webpages/stylesheets/org/jasig/portal/channels/CSnoop/CSnoop.xsl
  244. +21 −0 webpages/stylesheets/org/jasig/portal/channels/CTimeTitle/CTimeTitle.xsl
  245. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/html_friendly_de_DE.xsl
  246. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/html_friendly_en_US.xsl
  247. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/html_friendly_it_IT.xsl
  248. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/html_friendly_ja_JP.xsl
  249. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/html_friendly_lv_LV.xsl
  250. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/html_friendly_sv_SE.xsl
  251. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/html_full_de_DE.xsl
  252. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/html_full_en_US.xsl
  253. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/html_full_it_IT.xsl
  254. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/html_full_ja_JP.xsl
  255. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/html_full_lv_LV.xsl
  256. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/html_full_sv_SE.xsl
  257. +1 −1 webpages/stylesheets/org/jasig/portal/channels/error/CError/wml.xsl
  258. +20 −3 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes.xsl
  259. +2 −2 webpages/stylesheets/org/jasig/portal/layout/DLM-tab-column/nested-tables/nested-tables.xsl
View
@@ -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.2-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 =====================
@@ -68,6 +78,7 @@ commons-dbcp.jar=${lib.path}/commons-dbcp-1.2.1.jar
commons-pool.jar=${lib.path}/commons-pool-1.2.jar
servlet.jar=${lib.path}/servlet.jar
spring.jar=${lib.path}/spring.jar
+casclient.jar=${lib.path}/casclient-2.1.1.jar
jaxp.lib=${lib.path}/jaxp
View
@@ -313,6 +313,10 @@
Version CVS_HEAD (4/18/2005)
URL: http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/
+ casclient.jar Yale's Java CAS client.
+ Version 2.1.1
+ URL: http://www.ibiblio.org/maven/cas/jars/casclient-2.1.1.jar
+
-->
<property name="xalan.jar" value="(set this in build.properties!)"/>
@@ -341,6 +345,7 @@
<property name="jdom.jar" value="{set this in build.properties!)" />
<property name="concurrent.jar" value="{set this in build.properties!)" />
<property name="backport.jar" value="{set this in build.properties!)" />
+ <property name="casclient.jar" value="lib/casclient-2.1.1.jar" />
<!-- ==================== Compilation Classpath =========================== -->
@@ -383,6 +388,7 @@
<pathelement location="${jdom.jar}" />
<pathelement location="${concurrent.jar}" />
<pathelement location="${backport.jar}" />
+ <pathelement location="${casclient.jar}" />
</path>
@@ -475,13 +481,15 @@
destdir="${build.home}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
+ target="1.4"
+ source="1.4"
optimize="${compile.optimize}">
<classpath refid="compile.classpath"/>
</javac>
<!-- Copy non-java resources -->
<copy todir="${build.home}/WEB-INF/classes">
- <fileset dir="source" excludes="CVS,**/*.java"/>
+ <fileset dir="source" excludes="CVS,**/*.java,**/package.html"/>
</copy>
<!-- Copy associated resource files -->
@@ -559,6 +567,7 @@
<copy todir="${deploy.home}/WEB-INF/lib" file="${jdom.jar}" />
<copy todir="${deploy.home}/WEB-INF/lib" file="${concurrent.jar}" />
<copy todir="${deploy.home}/WEB-INF/lib" file="${backport.jar}" />
+ <copy todir="${deploy.home}/WEB-INF/lib" file="${casclient.jar}"/>
<!-- These are Tomcat-specific! We need to think about a new property
that lets us specify the appropriate directory for other servers
@@ -695,6 +704,8 @@
<!-- Test that JAXP is installed in the JVM before trying to compile all of uPortal -->
<mkdir dir="${build.home}/WEB-INF/classes"/>
<javac srcdir="source"
+ target="1.4"
+ source="1.4"
destdir="${build.home}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
@@ -1221,6 +1232,9 @@
<target name="compiletests" depends="compile"
description="Compile JUnit Tests">
<javac srcdir="tests"
+ target="1.4"
+ source="1.4"
+
destdir="${build.home}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
@@ -1245,7 +1259,8 @@
-->
<!-- You must copy junit.jar into $ANT_HOME/lib directory for this to work -->
<target name="runtests" depends="compiletests" description="Run JUnit Test Suite">
- <junit fork="true" printsummary="on" showoutput="off" dir=".." >
+ <junit fork="true" printsummary="off" showoutput="off" dir=".."
+ haltonerror="true" haltonfailure="true">
<classpath>
<pathelement path="${build.home}/WEB-INF/classes"/>
<path refid="tests.classpath"/>
@@ -1259,6 +1274,7 @@
<exclude name="**/DbTest.class"/>
</fileset>
</batchtest>
+ <formatter type="brief" usefile="no"/>
</junit>
</target>
@@ -1346,7 +1362,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
@@ -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.
Oops, something went wrong.

0 comments on commit c0a22ca

Please sign in to comment.