Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

This commit was manufactured by cvs2svn to create tag

'rel-2-4-4-RC1'.

git-svn-id: https://source.jasig.org/uPortal/tags/rel-2-4-4-RC1@10857 f5dbab47-78f9-eb45-b975-e544023573eb
  • Loading branch information...
commit 475f471539192ab2a027fa61496296c5b43f4c1a 1 parent 880bb63
infrastructure@lists.ja-sig.org authored
Showing with 8,539 additions and 5,485 deletions.
  1. +1 −0  .cvsignore
  2. +30 −0 LICENSE.txt
  3. +111 −0 README.txt
  4. +196 −0 RELEASE_NOTES.txt
  5. +6 −5 build.properties
  6. +97 −37 build.xml
  7. +7 −0 docs/README
  8. +55 −0 docs/licenses/License-ASF.txt
  9. +100 −0 docs/licenses/License-W3C.html
  10. +17 −0 docs/licenses/acknowledgements.txt
  11. +47 −0 docs/licenses/jaxp-binary.txt
  12. BIN  docs/uPortal_architecture_overview.pdf
  13. +137 −0 docs/uPortal_properties_overview.txt
  14. +102 −0 docs/uPortal_tools_overview.txt
  15. +11 −8 docs/website/implementors/services/compositeGroupService.html
  16. +19 −16 docs/website/implementors/services/compositeGroupService_prt.html
  17. +122 −0 etc/quickstart/README.txt
  18. +2 −0  etc/quickstart/ant.bat
  19. +4 −0 etc/quickstart/ant.sh
  20. +77 −0 etc/quickstart/build.xml
  21. +5 −0 etc/quickstart/fix-unix-modes.sh
  22. +55 −0 etc/uportal-quickstart-dist.sh
  23. +64 −0 etc/uportal-source-dist.sh
  24. BIN  lib/backport-util-concurrent.jar
  25. +48 −0 lib/jaxp/README.txt
  26. BIN  lib/jaxp/dom.jar
  27. BIN  lib/jaxp/jaxp-api.jar
  28. BIN  lib/jaxp/sax.jar
  29. BIN  lib/jaxp/xalan.jar
  30. BIN  lib/jaxp/xercesImpl.jar
  31. BIN  lib/{pluto-1.0.1.jar → pluto-1.0.1-rc1.jar}
  32. BIN  lib/portlets/RssPortlet.war
  33. BIN  lib/portlets/proxyportlet.war
  34. BIN  lib/portlets/testsuite.war
  35. 0  lib/{xalan.jar → xalan-2-6-0.jar}
  36. +3 −0  properties/Logger.properties
  37. +3 −3 properties/PersonDirs.xml
  38. +21 −0 properties/al/fragments.xml
  39. +33 −0 properties/chanpub/timetitle.xml
  40. +2 −2 properties/db/data.xml
  41. +4 −4 properties/db/tables.xml
  42. +15 −3 properties/security.properties
  43. +110 −2 properties/uPortal.xml
  44. +0 −119 scripts/createTables-hypersonic.script
  45. +0 −15 scripts/dropTables.script
  46. +0 −269 scripts/populateTables.script
  47. +33 −60 source/org/jasig/portal/ChannelDefinition.java
  48. +14 −8 source/org/jasig/portal/ChannelFactory.java
  49. +80 −40 source/org/jasig/portal/ChannelManager.java
  50. +27 −42 source/org/jasig/portal/ChannelRegistryManager.java
  51. +241 −103 source/org/jasig/portal/ChannelRenderer.java
  52. +11 −14 source/org/jasig/portal/ChannelRendererFactoryImpl.java
  53. +20 −0 source/org/jasig/portal/ChannelRuntimeData.java
  54. +5 −0 source/org/jasig/portal/ChannelRuntimeProperties.java
  55. +253 −94 source/org/jasig/portal/CharacterCachingChannelIncorporationFilter.java
  56. +4 −4 source/org/jasig/portal/EntityTypes.java
  57. +88 −6 source/org/jasig/portal/ExceptionHelper.java
  58. +1 −5 source/org/jasig/portal/GuestUserPreferencesManager.java
  59. +4 −1 source/org/jasig/portal/HttpProxyServlet.java
  60. +3 −3 source/org/jasig/portal/IChannelRenderer.java
  61. +21 −6 source/org/jasig/portal/LoginServlet.java
  62. +15 −8 source/org/jasig/portal/LogoutServlet.java
  63. +16 −2 source/org/jasig/portal/MediaManager.java
  64. +16 −7 source/org/jasig/portal/MultipartDataSource.java
  65. +5 −1 source/org/jasig/portal/PortalEvent.java
  66. +134 −133 source/org/jasig/portal/PortalException.java
  67. +8 −3 source/org/jasig/portal/PortalSessionManager.java
  68. +30 −71 source/org/jasig/portal/PortletPreferencesStoreFactory.java
  69. +7 −5 source/org/jasig/portal/RDBMChannelRegistryStore.java
  70. +2 −1  source/org/jasig/portal/RDBMPortletPreferencesStore.java
  71. +20 −15 source/org/jasig/portal/RDBMServices.java
  72. +256 −177 source/org/jasig/portal/RDBMUserLayoutStore.java
  73. +2 −1  source/org/jasig/portal/ReferenceSequenceGenerator.java
  74. +3 −7 source/org/jasig/portal/RequestParamWrapper.java
  75. +5 −5 source/org/jasig/portal/StandaloneChannelRenderer.java
  76. +1 −1  source/org/jasig/portal/StylesheetSet.java
  77. +14 −26 source/org/jasig/portal/UserInstance.java
  78. +35 −79 source/org/jasig/portal/UserLayoutStoreFactory.java
  79. +24 −22 source/org/jasig/portal/UserPreferencesManager.java
  80. +25 −4 source/org/jasig/portal/Version.java
  81. +2 −2 source/org/jasig/portal/car/ChannelDefinitionTagHandler.java
  82. +12 −4 source/org/jasig/portal/car/DatabaseTagHandler.java
  83. +304 −0 source/org/jasig/portal/channels/CAbstractXslt.java
  84. +1 −1  source/org/jasig/portal/channels/CApplet.java
  85. +29 −4 source/org/jasig/portal/channels/CChannelManager.java
  86. +27 −21 source/org/jasig/portal/channels/CError.java
  87. +140 −69 source/org/jasig/portal/channels/CGenericXSLT.java
  88. +2 −2 source/org/jasig/portal/channels/CHeader.java
  89. +1 −1  source/org/jasig/portal/channels/CImage.java
  90. +1 −1  source/org/jasig/portal/channels/CInlineFrame.java
  91. +6 −6 source/org/jasig/portal/channels/CNumberGuess.java
  92. +21 −36 source/org/jasig/portal/channels/CSecureInfo.java
  93. +3 −3 source/org/jasig/portal/channels/CSnoop.java
  94. +101 −0 source/org/jasig/portal/channels/CTimeTitle.java
  95. +2 −2 source/org/jasig/portal/channels/UserPreferences/CUserPreferences.java
  96. +21 −40 source/org/jasig/portal/channels/UserPreferences/GPreferencesState.java
  97. +24 −40 source/org/jasig/portal/channels/UserPreferences/ManageProfilesState.java
  98. +15 −37 source/org/jasig/portal/channels/groupsmanager/Utility.java
  99. +6 −6 source/org/jasig/portal/channels/iccdemo/CHistory.java
  100. +4 −4 source/org/jasig/portal/channels/iccdemo/CURLSelector.java
  101. +6 −6 source/org/jasig/portal/channels/iccdemo/CViewer.java
  102. +12 −11 source/org/jasig/portal/channels/permissionsmanager/CPermissionsManager.java
  103. +1 −1  source/org/jasig/portal/channels/permissionsmanager/CPermissionsManagerServant.java
  104. +2 −2 source/org/jasig/portal/channels/permissionsmanager/CPermissionsManagerServantFactory.java
  105. +1 −1  source/org/jasig/portal/channels/permissionsmanager/CommandFactory.java
  106. +1 −1  source/org/jasig/portal/channels/permissionsmanager/PermissiblePublishChannels.java
  107. +1 −1  source/org/jasig/portal/channels/permissionsmanager/PermissibleSubscribeChannels.java
  108. +3 −3 source/org/jasig/portal/channels/permissionsmanager/PermissionsXML.java
  109. +3 −3 source/org/jasig/portal/channels/permissionsmanager/RDBMPermissibleRegistry.java
  110. +1 −1  source/org/jasig/portal/channels/permissionsmanager/commands/AssignPermissions.java
  111. +62 −25 source/org/jasig/portal/channels/portlet/CPortletAdapter.java
  112. +3 −0  source/org/jasig/portal/channels/portlet/ChannelData.java
  113. +41 −0 source/org/jasig/portal/channels/support/IChannelTitle.java
  114. +38 −0 source/org/jasig/portal/channels/support/IDynamicChannelTitleRenderer.java
  115. +45 −0 source/org/jasig/portal/channels/support/TitledChannelRuntimeProperties.java
  116. +297 −148 source/org/jasig/portal/channels/webproxy/CWebProxy.java
  117. +1 −2  source/org/jasig/portal/concurrency/caching/LRUCache.java
  118. +4 −4 source/org/jasig/portal/concurrency/caching/RDBMCachedEntityInvalidationStore.java
  119. +6 −2 source/org/jasig/portal/concurrency/caching/ReferenceEntityCache.java
  120. +13 −6 source/org/jasig/portal/concurrency/caching/ReferenceInvalidatingEntityCache.java
  121. +7 −3 source/org/jasig/portal/concurrency/locking/MemoryEntityLockStore.java
  122. +4 −4 source/org/jasig/portal/concurrency/locking/RDBMEntityLockStore.java
  123. +42 −14 source/org/jasig/portal/concurrency/locking/ReferenceEntityLockService.java
  124. +24 −6 source/org/jasig/portal/container/binding/PortletApplicationUnmarshaller.java
  125. +1 −1  source/org/jasig/portal/container/binding/WebApplicationMarshaller.java
  126. +11 −37 source/org/jasig/portal/container/deploy/Deployer.java
  127. +7 −4 source/org/jasig/portal/container/om/common/LanguageImpl.java
  128. +49 −19 source/org/jasig/portal/container/om/common/LanguageSetImpl.java
  129. +3 −3 source/org/jasig/portal/container/om/entity/PortletEntityImpl.java
  130. +4 −2 source/org/jasig/portal/container/om/portlet/PortletDefinitionImpl.java
  131. +137 −107 source/org/jasig/portal/container/services/information/PortletStateManager.java
  132. +15 −2 source/org/jasig/portal/container/services/information/StaticInformationProviderImpl.java
  133. +86 −0 source/org/jasig/portal/container/servlet/DummyParameterRequestWrapper.java
  134. +0 −82 source/org/jasig/portal/container/servlet/EmptyRequestImpl.java
  135. +103 −0 source/org/jasig/portal/container/servlet/PortletParameterRequestWrapper.java
  136. +1 −1  source/org/jasig/portal/groups/EntityGroupNameFinder.java
  137. +46 −0 source/org/jasig/portal/groups/EntityTestingGroupImpl.java
  138. +14 −50 source/org/jasig/portal/groups/PersonDirNameFinder.java
  139. +5 −6 source/org/jasig/portal/groups/RDBMEntityGroupStore.java
  140. +1 −1  source/org/jasig/portal/groups/ReferenceChannelNameFinder.java
  141. +2 −2 source/org/jasig/portal/groups/ReferencePersonNameFinder.java
  142. +4 −7 source/org/jasig/portal/groups/ldap/LDAPGroupStore.java
  143. +2 −3 source/org/jasig/portal/groups/local/searchers/RDBMChannelDefSearcher.java
  144. +2 −3 source/org/jasig/portal/groups/local/searchers/RDBMPersonSearcher.java
  145. +5 −5 source/org/jasig/portal/groups/pags/PersonAttributesGroupStore.java
  146. +1 −1  source/org/jasig/portal/i18n/LocaleManager.java
  147. +1 −2  source/org/jasig/portal/jndi/JNDIManager.java
  148. +1 −1  source/org/jasig/portal/lang/Resources.java
  149. +9 −9 source/org/jasig/portal/lang/StackTrace.java
  150. +1 −1  source/org/jasig/portal/lang/ThrowableHelper.java
  151. +4 −4 source/org/jasig/portal/layout/ALNodeProperties.java
  152. +18 −14 source/org/jasig/portal/layout/AggregatedLayoutManager.java
  153. +24 −15 source/org/jasig/portal/layout/AggregatedUserLayoutStore.java
  154. +26 −38 source/org/jasig/portal/layout/SimpleLayout.java
  155. +208 −78 source/org/jasig/portal/layout/SimpleUserLayoutManager.java
  156. +4 −4 source/org/jasig/portal/layout/UserLayoutChannelDescription.java
  157. +65 −51 source/org/jasig/portal/layout/channels/CContentSubscriber.java
  158. +2 −0  source/org/jasig/portal/layout/channels/CFragmentManager.java
  159. +10 −5 source/org/jasig/portal/layout/utils/FragmentLoader.java
  160. +18 −43 source/org/jasig/portal/ldap/LdapServices.java
  161. +155 −179 source/org/jasig/portal/security/InitialSecurityContextFactory.java
  162. +1 −1  source/org/jasig/portal/security/provider/CacheSecurityContext.java
  163. +10 −5 source/org/jasig/portal/security/provider/ChainingSecurityContext.java
  164. +12 −11 source/org/jasig/portal/security/provider/RDBMPermissionImpl.java
  165. +42 −6 source/org/jasig/portal/security/provider/RemoteUserPersonManager.java
  166. +9 −0 source/org/jasig/portal/security/provider/RemoteUserSecurityContext.java
  167. +18 −13 source/org/jasig/portal/security/provider/RestrictedPerson.java
  168. +61 −56 source/org/jasig/portal/security/provider/SimpleLdapSecurityContext.java
  169. +1 −1  source/org/jasig/portal/security/provider/SimplePersonManager.java
  170. +1 −1  source/org/jasig/portal/security/provider/SimpleSecurityContext.java
  171. +1 −1  source/org/jasig/portal/security/provider/TrustSecurityContext.java
  172. +4 −4 source/org/jasig/portal/serialize/BaseMarkupSerializer.java
  173. +5 −5 source/org/jasig/portal/serialize/HTMLSerializer.java
  174. +32 −17 source/org/jasig/portal/serialize/HTMLdtd.java
  175. +4 −4 source/org/jasig/portal/serialize/XMLSerializer.java
  176. +50 −19 source/org/jasig/portal/services/Authentication.java
  177. +4 −5 source/org/jasig/portal/services/AuthorizationService.java
  178. +7 −8 source/org/jasig/portal/services/EntityPropertyRegistry.java
  179. +17 −17 source/org/jasig/portal/services/ExternalServices.java
  180. +3 −1 source/org/jasig/portal/services/GroupService.java
  181. +15 −8 source/org/jasig/portal/services/LogService.java
  182. +171 −116 source/org/jasig/portal/services/PersonDirectory.java
  183. +3 −2 source/org/jasig/portal/services/SequenceGenerator.java
  184. +36 −45 source/org/jasig/portal/services/StatsRecorder.java
  185. +2 −4 source/org/jasig/portal/services/entityproperties/ChannelRegistryPropertyFinder.java
  186. +2 −1  source/org/jasig/portal/services/entityproperties/ContainingGroupsFinder.java
  187. +1 −1  source/org/jasig/portal/services/entityproperties/PersonDirPropertyFinder.java
  188. +4 −8 source/org/jasig/portal/services/entityproperties/RDBMPropertyStore.java
  189. +2 −2 source/org/jasig/portal/services/stats/RecordChannelAddedToLayoutWorkerTask.java
  190. +2 −2 source/org/jasig/portal/services/stats/RecordChannelDefinitionModifiedWorkerTask.java
  191. +2 −2 source/org/jasig/portal/services/stats/RecordChannelDefinitionPublishedWorkerTask.java
  192. +2 −2 source/org/jasig/portal/services/stats/RecordChannelDefinitionRemovedWorkerTask.java
  193. +2 −2 source/org/jasig/portal/services/stats/RecordChannelInstantiatedWorkerTask.java
  194. +2 −2 source/org/jasig/portal/services/stats/RecordChannelMovedInLayoutWorkerTask.java
  195. +2 −2 source/org/jasig/portal/services/stats/RecordChannelRemovedFromLayoutWorkerTask.java
  196. +2 −2 source/org/jasig/portal/services/stats/RecordChannelRenderedWorkerTask.java
  197. +2 −2 source/org/jasig/portal/services/stats/RecordChannelTargetedWorkerTask.java
  198. +2 −2 source/org/jasig/portal/services/stats/RecordChannelUpdatedInLayoutWorkerTask.java
  199. +2 −2 source/org/jasig/portal/services/stats/RecordFolderAddedToLayoutWorkerTask.java
  200. +2 −2 source/org/jasig/portal/services/stats/RecordFolderMovedInLayoutWorkerTask.java
  201. +2 −2 source/org/jasig/portal/services/stats/RecordFolderRemovedFromLayoutWorkerTask.java
  202. +2 −2 source/org/jasig/portal/services/stats/RecordFolderUpdatedInLayoutWorkerTask.java
  203. +2 −2 source/org/jasig/portal/services/stats/RecordLoginWorkerTask.java
  204. +2 −2 source/org/jasig/portal/services/stats/RecordLogoutWorkerTask.java
  205. +2 −2 source/org/jasig/portal/services/stats/RecordSessionCreatedWorkerTask.java
  206. +2 −2 source/org/jasig/portal/services/stats/RecordSessionDestroyedWorkerTask.java
  207. +1 −1  source/org/jasig/portal/services/stats/StatsRecorderSettings.java
  208. +3 −3 source/org/jasig/portal/services/stats/StatsRecorderWorkerTask.java
  209. +1 −3 source/org/jasig/portal/tools/ChannelServlet.java
  210. +33 −0 source/org/jasig/portal/tools/LibCheck.java
  211. +38 −48 source/org/jasig/portal/tools/dbloader/Configuration.java
  212. +50 −53 source/org/jasig/portal/tools/dbloader/DbLoader.java
  213. +22 −47 source/org/jasig/portal/tools/dbloader/DbUtils.java
  214. +6 −45 source/org/jasig/portal/utils/DocumentFactory.java
  215. +28 −37 source/org/jasig/portal/utils/IPortalDocument.java
  216. +241 −226 source/org/jasig/portal/utils/PortalDocumentImpl.java
  217. +27 −11 source/org/jasig/portal/utils/RDBMCounterStore.java
  218. +8 −0 source/org/jasig/portal/utils/SAX2FilterImpl.java
  219. +20 −39 source/org/jasig/portal/utils/SoftHashMap.java
  220. +4 −4 source/org/jasig/portal/utils/SqlTransaction.java
  221. +27 −10 source/org/jasig/portal/utils/SubstitutionIntegerFilter.java
  222. +10 −6 source/org/jasig/portal/utils/SubstitutionServletOutputStream.java
  223. +7 −4 source/org/jasig/portal/utils/SubstitutionWriter.java
  224. +1 −1  source/org/jasig/portal/utils/URLUtil.java
  225. +171 −0 source/org/jasig/portal/utils/WeakValueMap.java
  226. +1 −1  source/org/jasig/portal/utils/XSLT.java
  227. +0 −255 source/org/jasig/portal/utils/threading/AbstractPool.java
  228. +54 −0 source/org/jasig/portal/utils/threading/BaseTask.java
  229. +0 −151 source/org/jasig/portal/utils/threading/BoundedQueue.java
  230. +0 −115 source/org/jasig/portal/utils/threading/BoundedThreadPool.java
  231. +29 −0 source/org/jasig/portal/utils/threading/PriorityThreadFactory.java
  232. +0 −89 source/org/jasig/portal/utils/threading/Queue.java
  233. +38 −0 source/org/jasig/portal/utils/threading/RunnableTask.java
  234. +18 −0 source/org/jasig/portal/utils/threading/Task.java
  235. +0 −106 source/org/jasig/portal/utils/threading/ThreadPool.java
  236. +0 −125 source/org/jasig/portal/utils/threading/UnboundedQueue.java
  237. +0 −59 source/org/jasig/portal/utils/threading/UnboundedThreadPool.java
  238. +0 −172 source/org/jasig/portal/utils/threading/WorkTracker.java
  239. +0 −138 source/org/jasig/portal/utils/threading/Worker.java
  240. +0 −138 source/org/jasig/portal/utils/threading/WorkerTask.java
  241. +51 −0 source/org/jasig/portal/utils/uri/BlockedUriException.java
  242. +30 −0 source/org/jasig/portal/utils/uri/IUriScrutinizer.java
  243. +207 −0 source/org/jasig/portal/utils/uri/PrefixUriScrutinizer.java
  244. +3 −1 source/org/jasig/portal/wsrp/ChannelInstanceManager.java
  245. +2 −2 source/org/jasig/portal/wsrp/bind/WSRP_v1_ServiceDescription_Binding_SOAPImpl.java
  246. +3 −3 source/org/jasig/portal/wsrp/types/CookieProtocol.java
  247. +3 −3 source/org/jasig/portal/wsrp/types/StateChange.java
  248. +217 −0 tests/org/jasig/portal/ExceptionHelperTest.java
  249. +42 −0 tests/org/jasig/portal/channels/CSecureInfoTest.java
  250. +74 −0 tests/org/jasig/portal/channels/EventRecordingChannel.java
  251. +3 −3 tests/org/jasig/portal/concurrency/locking/EntityLockTester.java
  252. +54 −0 tests/org/jasig/portal/container/services/information/StaticInformationProviderImplTest.java
  253. +72 −4 tests/org/jasig/portal/groups/GroupsTester.java
  254. +33 −19 tests/org/jasig/portal/lang/ChainedThrowable_Test.java
  255. +33 −33 tests/org/jasig/portal/lang/Resources_Test.java
  256. +33 −19 tests/org/jasig/portal/lang/StackTrace_Test.java
  257. +33 −19 tests/org/jasig/portal/lang/ThrowableHelper_Test.java
  258. +33 −19 tests/org/jasig/portal/lang/TypeConverter_Test.java
  259. +234 −0 tests/org/jasig/portal/security/provider/RestrictedPersonTest.java
  260. +83 −1 webpages/media/org/jasig/portal/channels/CGenericXSLT/CGenericXSLT.cpd
  261. +96 −2 webpages/media/org/jasig/portal/channels/CGenericXSLT/RSS/RSS.cpd
  262. +5 −5 webpages/media/org/jasig/portal/channels/portlet/wsrp-consumer.cpd
  263. +76 −7 webpages/media/org/jasig/portal/channels/webproxy/CWebProxy.cpd
  264. +0 −6 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Entries
  265. +0 −1  webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Repository
  266. +0 −1  webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Root
  267. +10 −2 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html.xsl
  268. +10 −2 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_en_US.xsl
  269. +10 −2 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_it_IT.xsl
  270. +310 −302 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_ja_JP.xsl
  271. +10 −2 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_lv_LV.xsl
  272. +10 −2 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_sv_SE.xsl
  273. +21 −0 webpages/stylesheets/org/jasig/portal/channels/CTimeTitle/CTimeTitle.xsl
  274. +36 −2 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes.xsl
View
1  .cvsignore
@@ -2,3 +2,4 @@ build
dist
.project
.classpath
+.settings
View
30 LICENSE.txt
@@ -0,0 +1,30 @@
+Copyright 2000-2005 The JA-SIG Collaborative. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+3. Redistributions of any form whatsoever must retain the following
+ acknowledgment:
+ "This product includes software developed by the JA-SIG Collaborative
+ (http://www.jasig.org/)."
+
+THIS SOFTWARE IS PROVIDED BY THE JA-SIG COLLABORATIVE "AS IS" AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JA-SIG COLLABORATIVE OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
View
111 README.txt
@@ -0,0 +1,111 @@
+$Id$
+
+uPortal Distribution
+--------------------------
+
+Purpose
+-------
+This distribution is targeted towards
+people who would like to install
+uPortal in a development or production
+environment. It contains uPortal source
+code and properties files, but not a servlet
+container, directory, or relational database,
+which are required. Use of this distribution
+requires knowledge of J2EE environments and the
+Ant tool from the Apache Jakarta project.
+
+
+Contents
+--------
+1) uPortal
+2) uPortal dependencies (Xalan, Pluto, etc).
+3) uPortal Architecture overview and JavaDoc API
+
+
+System requirements
+-------------------
+JDK 1.4 or higher
+JAVA_HOME environment variable must be set
+Installation of Ant from Jakarta:
+ http://ant.apache.org/
+
+
+Instructions
+------------
+Modify build.properties with local settings.
+
+Use the following ant targets:
+
+initportal - installs uPortal into a servlet container,
+ prepares a relational database with uPortal schema and data,
+ publishes channels and layout fragments,
+ deploys portlet applications
+dist - creates JavaDoc, uPortal jar, and uPortal WAR files.
+
+For descriptions of other Ant targets,
+see docs/uPortal_tools_overview.txt.
+
+Make sure the database and servlet container are running and
+access uPortal with http://localhost:8080/uPortal/
+Your URL may be different if you have configured a different port
+and/or context name.
+
+You can login to uPortal with the following user name/password
+combinations:
+
+demo, demo
+student, student
+faculty, faculty
+staff, staff
+developer, developer
+
+Each user may have a slightly different layout.
+
+
+Notes
+-----
+-Several properties files and one database table changed
+ since uPortal 2.3.x. If you are upgrading from this version,
+ you will need to see to it that your properties files and
+ database data are upgraded appropriately. The difficulty
+ of upgrading from 2.3.x to 2.4.x is expected to be much lower
+ than similar upgrades in past versions.
+
+-uPortal does not strictly require the use of connection
+ pooling, but it is highly recommended for production
+ installations. If your servlet container does not provide
+ connection pooling, try something like Yet Another Poolman.
+ For information about Yet Another Poolman,
+ see http://yapoolman.sourceforge.net/.
+
+-Bug fixes from 2.3.x releases have been implemented in 2.4.x
+ whenever they were appropriate
+
+-If you experience XML/XSLT-related errors, there is a good
+ chance that your environment is not using the version of
+ Xalan/Xerces that comes with this release. If you are using
+ Tomcat, try copying the following files into Tomcat's
+ common/endorsed directory: xalan.jar, xercesImpl.jar, xml-apis.jar.
+ Alternatively, you can specify the use of these jar files
+ via a java parameter when starting your servlet container:
+ -Xbootclasspath/p:xalan.jar;xercesImpl.jar;xml-apis.jar
+ For more information, see Version section of
+ http://xml.apache.org/xalan-j/faq.html
+
+-JSR 168 Portlets are supported in this version of uPortal.
+ For information on installing Portlets, see
+ http://www.uportal.org/implementors/portlets/workingWithPortlets.html.
+
+-WSRP functionality was included in uPortal as early as uPortal 2.2.
+ However, beginning with uPortal 2.4, the WSRP consumer has been replaced with
+ one based on WSRP4J. The WSRP producer has been deprecated but may
+ be reintroduced in a future release.
+
+Please report bugs and suggestions:
+
+ http://www.uportal.org/bugzilla/
+
+uPortal website:
+
+ http://www.uportal.org
View
196 RELEASE_NOTES.txt
@@ -0,0 +1,196 @@
+$Id$
+
+uPortal Release Notes
+---------------------
+Release Notes - uPortal - Version 2.4.4-RC1
+
+** Bug
+ * [UP-812] - resource-ref not properly parsed in portlet Deployer
+ * [UP-924] - PersonDirNameFinder getName() may return null
+ * [UP-927] - PersonDirNameFinder not threadsafe
+ * [UP-1088] - PortletPreferencesStoreFactory double checked locking [2-4]
+ * [UP-1091] - UserLayoutStoreFactory double checked locking [2-4]
+ * [UP-1142] - deployPortletApp can't install correctly web.xml utf-8 encoding.
+ * [UP-1167] - GuestUserPreferencesManager loses non-Exception cause
+ * [UP-1227] - WebProxy does not close urlconnection inputstream
+ * [UP-1252] - Change processing order for uP_save
+ * [UP-1305] - LoginServlet doesn't cope with ISE from multiply invalidating session
+ * [UP-1309] - LogoutServlet doesn't cope with ISE on sesion.invalidate().
+
+** New Feature
+ * [UP-1024] - add CAbstractXslt
+ * [UP-1246] - Dynamic channel titles
+
+** Improvement
+ * [UP-1135] - JavaDoc UserInstance.systemCache
+ * [UP-1136] - JavaDoc UserInstance.systemCharacterCache
+ * [UP-1137] - eliminate use of concat operator in default persondirs query to support more dbs by default
+ * [UP-1168] - RemoteUserPersonManager support security chains in security.properties
+ * [UP-1195] - Make SoftHashMap inherently threadsafe
+ * [UP-1240] - upgrade to JAXP 1.3 XML APIs (for uPortal 2.4.x)
+ * [UP-1245] - SAX2FilterImpl provide protected Log instance
+ * [UP-1261] - Implement layout cachekey optimization to improve layout caching.
+ * [UP-1306] - Include URI of missing resource in XSLT missing resource exception message
+ * [UP-1308] - ChannelRuntimeProperties protected Log instance
+
+Notes:
+
+ This is the first 2.4.x release to include support for being compiled or
+ running under JDK 1.4 or 1.5. For those not familiar, JDK 1.4 includes support
+ for JAXP 1.2 and JDK 1.5 supports JAXP 1.3. JAXP[1] is an API that allows an
+ application to process an XML document independent of the underlying XML
+ processing engine[2]. The support for DOM Level 3[3] was a main driver for
+ introducing the JAXP 1.3 release. Unfortunately, the JAXP 1.3 API is not
+ backwards compatible with JAXP 1.2[4].
+
+ This means that an application programmed to use the JAXP 1.3 API will compile/run
+ with no problems under JDK 1.5, but fails under an out-of-the-box JDK 1.4 install.
+ To remedy this problem (JAXP 1.3 with JDK 1.4), Sun makes available the JAXP 1.3
+ libraries, which must be referenced by the JDK 1.4 Java Compiler or Application
+ BEFORE the JAXP 1.2 libraries that ship with the JDK.
+
+ For compilation in uPortal, this is done by installing the JAXP 1.3 libraries
+ (/portal/lib/jaxp/*.jar) into the $JDK_HOME/jre/lib/endorsed directory. For
+ running Tomcat, this is done by copying these libraries into the
+ $TOMCAT_HOME/common/endorsed directory[5]. Both of these actions are performed
+ by the ant JAXP-Install target. Technically, the JAXP 1.3 JAR files are being added
+ to the Java bootclasspath, which tells Java to look in there for a class before
+ looking in the runtime JAR ($JAVA_HOME/jre/lib/rt.jar).
+
+ Note that all generated .class file compatibility is 1.4.
+
+ 1. Compile under JDK 1.4:
+ - ant JAXP-Install
+ - ant initportal (or deploy)
+ 2. Compile under JDK 1.5:
+ - ant initportal (or deploy)
+ 3. Run under JDK 1.4/Tomcat 5.0.x:
+ - must do step 1
+ 4. Run under JDK 1.5/Tomcat 5.0.x:
+ - must do step 2
+ - must remove $TOMCAT_HOME/common/endorsed/xercesImpl.jar
+ - must remove $TOMCAT_HOME/common/endorsed/xml-apis.jar
+ 5. Run under JDK 1.5/Tomcat 5.5.x:
+ - must do step 2
+
+[1] http://java.sun.com/webservices/jaxp/index.jsp
+[2] http://java.sun.com/webservices/jaxp/reference/faqs/index.html
+[3] http://www.w3.org/DOM/
+[4] http://java.sun.com/j2se/1.5.0/docs/guide/xml/jaxp/JAXP-Compatibility_150.html
+[5] http://java.sun.com/j2se/1.4.2/docs/guide/standards/index.html
+
+[a] https://clearinghouse.ja-sig.org/wiki/display/UPC/XML+API+standardization
+[b] https://clearinghouse.ja-sig.org/wiki/display/UPC/Compiling+under+JDK+1.5
+[c] https://clearinghouse.ja-sig.org/wiki/display/UPC/Practical+uP25+XML+Changes
+
+----------------------------------------------------------------
+uPortal Release Notes
+---------------------
+Release Notes - uPortal - Version 2.4.3.1
+
+**Bug
+
+ * [UP-1253] - CWebProxy security exploit: proxies file system content
+ * [UP-245] - CPD default="true" not functional
+
+Notes:
+
+ 1. CWebProxy and CGenericXSLT changed for this release to address
+ security vulnerabilities. These channels honor fewer
+ ChannelRuntimeParameters now. This will not affect most deployments.
+ A few deployments will need to re-examine CWebProxy and re-implement the
+ insecure features that were removed in more secure ways. CWebProxy
+ also changed to require that the xmlUri be an http:// or https:// URI.
+ You can make this rule more or less restrictive by publish-time
+ configuration of CWebProxy instances. [UP-1253]
+
+ 2. This release and all prior uPortal releases do NOT support JAXP 1.3.
+ This means that it will not compile/run under JDK 1.5 OR JDK 1.4 with
+ JAXP 1.3 installed. It will compile/run under JDK 1.4. uPortal 2.4.4
+ is scheduled to include support for JAXP 1.3.
+
+ Support for JDK 1.5 or JDK 1.4 w/ JAXP 1.3 is provided in and after
+ the uPortal 2.5.0 release.
+
+
+----------------------------------------------------------------
+uPortal Release Notes
+---------------------
+Release Notes - uPortal - Version 2.4.3
+
+**Bug
+
+ * [UP-694] - NPE persists after publishing fragment with no name and description
+ * [UP-735] - Content Subscriber exception when searching for "what's"
+ * [UP-754] - Problem on deleting non-empty tabs
+ * [UP-818] - HttpProxyServlet ignores query string
+ * [UP-823] - MInesweeper codebase web site moved.
+ * [UP-849] - RDBMPortletPreferencesStore doesn't support MS-SQL
+ * [UP-865] - simple layout manager won't start
+ * [UP-921] - very long time to connect: AggregatedUserLayoutStore SQL
+ * [UP-931] - ChannelRenderer finalizer is causing lots of loitered objects in memory causing a serious memory leak.
+ * [UP-1016] - BoundedThreadPool infinite loop or deadlock [2-4-patches]
+ * [UP-1102] - Restore safety to channel rendering
+ * [UP-1119] - memory leak happens under stress when CPortletAdapter portlets are asked to clean themselves up when the session ends.
+ * [UP-1123] - PortletStateManager.clearState(PortletWindow) implementation is buggy and can lead to ConcurrentModificationException under stress.
+ * [UP-1145] - access to SoftHashMap systemCache across threads is not synchronized
+
+**Improvement
+
+ * [UP-734] - Make "Cannot start uPortal" message give HTTP 500 status code
+ * [UP-815] - ChannelFactory should log source exception on instantiation failure
+ * [UP-992] - MultipartDataSource.finalize( ) is not implemented properly.
+ * [UP-1079] - StaticInformationProvider.getPortletDefinition() should give helpful exception if portletGUID doesn't have a "."
+ * [UP-1146] - javadoc SoftHashMap to say it isn't synchronized
+ * [UP-1177] - org.jasig.portal.MultipartDataSource incorrectly implemented finalize ( ) method.
+ * [UP-1178] - HTMLdtd.fromChar(int) method creats un-necessary objects during the lookup.
+ * [UP-1179] - Debug statements in the codebase causes un-necessary creation of string objects.
+ * [UP-1180] - Reduce object creation in SubstitutionIntegerFilter.java
+ * [UP-1181] - Reduce number of MediaManager objects created
+ * [UP-1187] - Enhance ChannelRuntimeData by adding a new method that generates the functional-name-focusing URL for channels.
+
+----------------------------------------------------------------
+Release Notes - uPortal - Version 2.4.2
+
+** Bug
+ * [UP-338] - RENDERING_DONE Event never sent
+ * [UP-476] - User's LDAP groups not loaded if username contains uppercase
+ * [UP-512] - User agent too long for db column
+ * [UP-685] - wrong fname in fragment produces exception with no useful error
+ message
+ * [UP-744] - PersonDirectory has a memory leak related to caching IPersons in
+ a WeakHashMap
+ * [UP-745] - ChannelManager has a memory leak, when it swaps out a channel
+ for the CError channel, the end session events never progagate
+ to the original channel
+ * [UP-746] - CSecureInfo has a memory leak, when ChannelManager swaps out a
+ channel for the CSecureInfo channel, the to end session events
+ never propagate to the original channel
+ * [UP-747] - Change to portlet parameter encoding breaks download worker URLs
+ * [UP-748] - Infinite recursion in RestrictedPerson
+ * [UP-749] - render parameter does not survive refresh
+ * [UP-753] - ChannelFactory should not expose internal map of static channels,
+ not create more than one instance of a multithreaded channel
+ * [UP-758] - CContentSubscriber prints exception to stdout instead of log
+ * [UP-759] - Xalan jar should be deployed to endorsed directory
+ * [UP-760] - Entity locks not expired correctly
+ * [UP-761] - A lock owner is limited to single READ lock on an entity
+ * [UP-772] - Classpath resources not being copied to build
+ * [UP-775] - Duplicate read locks for a single owner not permitted.
+ * [UP-776] - WebApplicationMarshaller.java turns resource-ref into
+ resource-env-ref
+ * [UP-778] - AggregatedLayoutManager.loadUserLayout() fails to log stack
+ trace for exception
+ * [UP-779] - ChannelRenderer declares constants that are already declared
+ in its base class
+ * [UP-780] - Eliminate "unknown additional descriptor warning" when using
+ ChainingSecurityContext
+ * [UP-796] - contains() doesn't always work for PAGS groups
+ * [UP-798] - GroupService.isComposite always returns null
+ * [UP-811] - NPE when Data tag not present in DatabaseTagHandler
+
+** Improvement
+ * [UP-770] - Document hsqldb version included with uPortal
+ * [UP-800] - Add comment to clarify usage of Logger.properties
+ * [UP-809] - Move portlet request attribute configuration to helper method
+ * [UP-810] - Log logging implementation
View
11 build.properties
@@ -15,10 +15,10 @@
#==================== File and Directory Names ========================
app.name=uPortal
-app.version=2.4
+app.version=2.4.4-RC1
lib.path=lib
-server.home=/JavaClasses/jakarta-tomcat-5.0.25
+server.home=/JavaClasses/jakarta-tomcat-5.0.28
deploy.home=${server.home}/webapps/uPortal
@@ -32,7 +32,7 @@ compile.optimize=true
#==================== External Dependencies ===========================
-xalan.jar=${lib.path}/xalan.jar
+xalan.jar=${lib.path}/xalan-2-6-0.jar
xercesImpl.jar=${lib.path}/xercesImpl.jar
xml-apis.jar=${lib.path}/xml-apis.jar
tidy.jar=${lib.path}/tidy.jar
@@ -49,7 +49,7 @@ wsdl4j.jar=${lib.path}/wsdl4j.jar
commons-discovery.jar=${lib.path}/commons-discovery.jar
commons-logging.jar=${lib.path}/commons-logging.jar
portlet-api.jar=${lib.path}/portlet-api-1.0.jar
-pluto.jar=${lib.path}/pluto-1.0.1.jar
+pluto.jar=${lib.path}/pluto-1.0.1-rc1.jar
wsrp4j-shared.jar=${lib.path}/wsrp4j-shared-0.3.jar
wsrp4j-consumer.jar=${lib.path}/wsrp4j-consumer-0.3.jar
proxyportlet.jar=${lib.path}/proxyportlet.jar
@@ -57,4 +57,5 @@ jdbc2_0-stdext.jar=${lib.path}/jdbc2_0-stdext.jar
jdbcDriver.jar=${lib.path}/hsqldb.jar
junit.jar=${lib.path}/junit.jar
servlet.jar=${lib.path}/servlet.jar
-
+backport.jar=${lib.path}/backport-util-concurrent.jar
+jaxp.lib=${lib.path}/jaxp
View
134 build.xml
@@ -237,20 +237,20 @@
URL: http://jakarta.apache.org/commons/logging.html
portlet-api.jar Portlet API based on JSR-168.
- Version: (from jakarta-pluto CVS on September 22, 2004)
+ Version: (from jakarta-pluto CVS on November 2, 2004)
URL: http://www.jcp.org/en/jsr/detail?id=168
pluto.jar Reference Implementation of the Java Portlet Specfication.
This Portlet container provides a runtime environment for
portlets implemented according to the Portlet API.
The project is still in the Apache Incubator.
- Version: (from jakarta-pluto CVS on September 22, 2004)
+ Version: (from jakarta-pluto CVS on November 2, 2004)
URL: http://portals.apache.org/pluto/
wsrp4j-shared.jar WSRP4J shared classes mostly derived from OASIS WSRP WSDL.
Comes with WSRP4J.
Use the version that comes with WSRP4J.
- Version: (from ws-wsrp4j CVS on July 9, 2004)
+ Version: (from ws-wsrp4j CVS on November 2, 2004)
URL: http://ws.apache.org/wsrp4j/
wsrp4j-consumer.jar WSRP4J consumer classes.
@@ -264,20 +264,6 @@
The following modifications were made to the
WSRP4J proxy portlet source:
-
- - org.apache.wsrp4j.consumer.portlet.impl.ProxyPortlet:
-
- IS: protected PortletKey getPortletKey(Map preferences)
- WAS: private PortletKey getPortletKey(Map preferences)
-
- IS: protected Producer getProducer(String producerID) throws WSRPException
- WAS: private Producer getProducer(String producerID) throws WSRPException
-
- Added new method
- protected ConsumerEnvironment getConsumerEnvironment()
- {
- return consumerEnv;
- }
- portlet.xml
@@ -286,7 +272,7 @@
IS: <value>org.jasig.portal.wsrp.consumer.portlet.ConsumerEnvironmentImpl</value>
WAS: <value>org.apache.wsrp4j.consumer.portlet.impl.ConsumerEnvironmentImpl</value>
-
+
- wsrp4j-logger.properties
IS: log4j.appender.A1.File=wsrp4j-consumer.log
@@ -322,7 +308,10 @@
by your servlet container.
Version: 2.2, 2.3, or 2.4
URL: http://jakarta.apache.org/tomcat/
-
+backport-util-concurrent.jar Backport of Doug Lea's Concurrency package. Similar
+ to the Java 1.5 java.util.concurrent package.
+ Version CVS_HEAD (4/18/2005)
+ URL: http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/
-->
<property name="xalan.jar" value="(set this in build.properties!)"/>
@@ -350,6 +339,7 @@
<property name="jdbcDriver.jar" value="(set this in build.properties!)"/>
<property name="junit.jar" value="(set this in build.properties!)"/>
<property name="servlet.jar" value="(set this in build.properties!)"/>
+ <property name="backport.jar" value="{set this in build.properties!)" />
@@ -393,7 +383,7 @@
<pathelement location="${jdbc2_0-stdext.jar}"/>
<pathelement location="${jdbcDriver.jar}"/>
<pathelement location="${servlet.jar}"/>
-
+ <pathelement location="${backport.jar}" />
</path>
@@ -461,14 +451,35 @@
<!-- Compile Java classes as necessary -->
<mkdir dir="${build.home}/WEB-INF/classes"/>
+ <echo message="Compiling uPortal (except for WSRP)"/>
<javac srcdir="source"
destdir="${build.home}/WEB-INF/classes"
+ excludes="org/jasig/portal/wsrp/**"
+ source="1.4"
+ target="1.4"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
<classpath refid="compile.classpath"/>
</javac>
+ <echo message="Compiling WSRP for uPortal"/>
+ <javac srcdir="source"
+ destdir="${build.home}/WEB-INF/classes"
+ includes="org/jasig/portal/wsrp/**"
+ source="1.4"
+ target="1.4"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ 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"/>
+ </copy>
+
<!-- Copy associated resource files -->
<copy todir="${build.home}/WEB-INF/classes/properties">
<fileset dir="properties" includes="**/*"/>
@@ -477,11 +488,6 @@
<!-- Copy the Logger.properties file to the well-known location
log4j expects.-->
<copy file="properties/Logger.properties" tofile="${build.home}/WEB-INF/classes/log4j.properties"/>
-
- <!-- Copy serializer resources -->
- <copy todir="${build.home}/WEB-INF/classes/org/jasig/portal/serialize">
- <fileset dir="source/org/jasig/portal/serialize" includes="**/*.res"/>
- </copy>
<!-- Copy all stylesheets, stylesheet descriptions and stylesheet list files -->
<copy todir="${build.home}/WEB-INF/classes">
@@ -528,7 +534,6 @@
<!-- Copy external dependencies as required -->
<mkdir dir="${deploy.home}/WEB-INF/lib"/>
- <copy todir="${deploy.home}/WEB-INF/lib" file="${xalan.jar}"/>
<copy todir="${deploy.home}/WEB-INF/lib" file="${xercesImpl.jar}"/>
<copy todir="${deploy.home}/WEB-INF/lib" file="${xml-apis.jar}"/>
<copy todir="${deploy.home}/WEB-INF/lib" file="${tidy.jar}"/>
@@ -546,12 +551,14 @@
<copy todir="${deploy.home}/WEB-INF/lib" file="${commons-logging.jar}"/>
<copy todir="${deploy.home}/WEB-INF/lib" file="${jdbc2_0-stdext.jar}"/>
<copy todir="${deploy.home}/WEB-INF/lib" file="${jdbcDriver.jar}"/>
+ <copy todir="${deploy.home}/WEB-INF/lib" file="${backport.jar}" />
- <!-- This is Tomcat-specific! We need to think about a new property
+ <!-- There are Tomcat-specific! We need to think about a new property
that lets us specify the appropriate directory for other servers
-->
<copy todir="${server.home}/shared/lib" file="${portlet-api.jar}"/>
<copy todir="${server.home}/shared/lib" file="${pluto.jar}"/>
+ <copy todir="${server.home}/common/endorsed" file="${xalan.jar}"/>
<!-- This is Tomcat-specific and server name-specific!
We need to find out the best way to ensure cross-context
@@ -619,8 +626,7 @@
-->
- <target name="javadoc" depends="compile"
- description="Create Javadoc API documentation">
+ <target name="javadoc" description="Create Javadoc API documentation">
<mkdir dir="${dist.home}/docs/api"/>
<javadoc sourcepath="source"
@@ -662,6 +668,23 @@
<!-- Copy static files from external dependencies as needed -->
+ <!-- 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"
+ destdir="${build.home}/WEB-INF/classes"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}">
+ <include name="org/jasig/portal/tools/LibCheck.java"/>
+ <classpath refid="compile.classpath"/>
+ </javac>
+ <java fork="true" failonerror="true" dir="" classname="org.jasig.portal.tools.LibCheck">
+ <classpath>
+ <pathelement path="${build.home}/WEB-INF/classes"/>
+ <path refid="compile.classpath"/>
+ </classpath>
+ </java>
+
</target>
@@ -908,7 +931,7 @@
The variable fragmentFile points to the XML file of the fragments definition
- ant fragment -DfragmentFile=/properties/al/fragments.xml
+ ant pubfragments -DfragmentFile=/properties/al/fragments.xml
-->
@@ -1280,24 +1303,23 @@
-->
-
+
<target name="pubchan" description="Publishes channels" depends="compile">
<echo message="Invoking Channel Publisher Tool"/>
-
+
<property name="channel" value=" "/>
<java fork="true" dir="${basedir}" classname="org.jasig.portal.tools.chanpub.ChannelPublisher">
- <classpath refid="compile.classpath"/>
<classpath>
- <pathelement path="${build.home}/WEB-INF/classes"/>
+ <pathelement path="${build.home}/WEB-INF/classes"/>
+ <path refid="compile.classpath"/>
</classpath>
<arg value="-n"/>
<arg value="${channel}"/>
</java>
</target>
-
-<!-- ===================== deployPortlet Target ========================= -->
+<!-- ===================== deployPortletApp Target ========================= -->
<!--
@@ -1318,13 +1340,51 @@
<property name="portletApp" value=" "/>
<java fork="true" dir="${basedir}" classname="org.jasig.portal.container.deploy.Deployer">
- <classpath refid="compile.classpath"/>
<classpath>
<pathelement path="${build.home}/WEB-INF/classes"/>
+ <path refid="compile.classpath"/>
</classpath>
<arg value="${deploy.home}/.."/>
<arg value="${portletApp}"/>
</java>
</target>
+ <!-- ===================== JAXP-Install Target ========================= -->
+
+ <!--
+
+ The "JAXP-Install" copies the JAXP libraries into the JAVA_HOME/lib/endorsed
+ directory of your JDK and into the ${server.home}/common/endorsed directory.
+ The copying for the server.home is assuming Tomcat as the container.
+
+ -->
+
+ <target name="JAXP-Install"
+ description="Installs JAXP into the JVM and container">
+
+ <!--
+ Ensure we are installing to a 1.4 JDK
+ -->
+ <fail message="Cannot install JAXP on ${java.version}. Expected version is 1.4.*">
+ <condition>
+ <not>
+ <contains string="JDK${java.version}" substring="JDK1.4"/>
+ </not>
+ </condition>
+ </fail>
+
+ <echo message="Installing JAXP to:"/>
+
+ <echo message="${java.home}/lib/endorsed"/>
+ <mkdir dir="${java.home}/lib/endorsed"/>
+ <copy todir="${java.home}/lib/endorsed">
+ <fileset dir="${jaxp.lib}" includes="*.jar"/>
+ </copy>
+
+ <echo message="${server.home}/common/endorsed"/>
+ <mkdir dir="${server.home}/common/endorsed"/>
+ <copy todir="${server.home}/common/endorsed">
+ <fileset dir="${jaxp.lib}" includes="*.jar"/>
+ </copy>
+ </target>
</project>
View
7 docs/README
@@ -53,6 +53,13 @@ The following ant command will deploy the documentation:
ant deploy
+About HSQLDB
+------------
+
+Using an older version of hsqldb.jar with another version of the HSQLDB server could cause uPortal to hang.
+See hsqldb.jar's entry in build.xml for documentation of exactly what version of hsqldb.jar is included with this release.
+
+
Copyright
---------
View
55 docs/licenses/License-ASF.txt
@@ -0,0 +1,55 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xalan" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation and was
+ * originally based on software copyright (c) 1999, Lotus
+ * Development Corporation., http://www.lotus.com. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
View
100 docs/licenses/License-W3C.html
@@ -0,0 +1,100 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+ "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>W3C IPR SOFTWARE NOTICE</title>
+ </head>
+ <body bgcolor="#FFFFFF" text="#000000">
+ <h1>
+ W3C IPR SOFTWARE NOTICE
+ </h1>
+ <h3>
+ Copyright &copy; 2000 <loc href="http://www.w3.org/">World Wide Web
+ Consortium</loc>, (<loc href="http://www.lcs.mit.edu/">Massachusetts
+ Institute of Technology</loc>, <loc href="http://www.inria.fr/">Institut
+ National de Recherche en Informatique et en Automatique</loc>, <loc
+ href="http://www.keio.ac.jp/">Keio University</loc>). All Rights
+ Reserved.
+ </h3>
+ <p>
+ The DOM bindings are published under the W3C Software Copyright Notice
+ and License. The software license requires "Notice of any changes or
+ modifications to the W3C files, including the date changes were made."
+ Consequently, modified versions of the DOM bindings must document that
+ they do not conform to the W3C standard; in the case of the IDL binding,
+ the pragma prefix can no longer be 'w3c.org'; in the case of the Java
+ binding, the package names can no longer be in the 'org.w3c' package.
+ </p>
+ <p>
+ <b>Note:</b> The original version of the W3C Software Copyright Notice
+ and License could be found at <a
+ href='http://www.w3.org/Consortium/Legal/copyright-software-19980720'>http://www.w3.org/Consortium/Legal/copyright-software-19980720</a>
+ </p>
+ <h3>
+ Copyright &copy; 1994-2000 <a href="http://www.w3.org/">World Wide Web
+ Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts
+ Institute of Technology</a>, <a href="http://www.inria.fr/">Institut
+ National de Recherche en Informatique et en Automatique</a>, <a
+ href="http://www.keio.ac.jp/">Keio University</a>). All Rights
+ Reserved. http://www.w3.org/Consortium/Legal/
+ </h3>
+ <p>
+ This W3C work (including software, documents, or other related items) is
+ being provided by the copyright holders under the following license. By
+ obtaining, using and/or copying this work, you (the licensee) agree that
+ you have read, understood, and will comply with the following terms and
+ conditions:
+ </p>
+ <p>
+ Permission to use, copy, and modify this software and its documentation,
+ with or without modification,&nbsp; for any purpose and without fee or
+ royalty is hereby granted, provided that you include the following on ALL
+ copies of the software and documentation or portions thereof, including
+ modifications, that you make:
+ </p>
+ <ol>
+ <li>
+ The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+ </li>
+ <li>
+ Any pre-existing intellectual property disclaimers, notices, or terms
+ and conditions. If none exist, a short notice of the following form
+ (hypertext is preferred, text is permitted) should be used within the
+ body of any redistributed or derivative code: "Copyright &copy;
+ [$date-of-software] <a href="http://www.w3.org/">World Wide Web
+ Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts
+ Institute of Technology</a>, <a href="http://www.inria.fr/">Institut
+ National de Recherche en Informatique et en Automatique</a>, <a
+ href="http://www.keio.ac.jp/">Keio University</a>). All Rights
+ Reserved. http://www.w3.org/Consortium/Legal/"
+ </li>
+ <li>
+ Notice of any changes or modifications to the W3C files, including the
+ date changes were made. (We recommend you provide URIs to the location
+ from which the code is derived.)
+ </li>
+ </ol>
+ <p>
+ THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
+ HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
+ DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+ TRADEMARKS OR OTHER RIGHTS.
+ </p>
+ <p>
+ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+ CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+ DOCUMENTATION.
+ </p>
+ <p>
+ The name and trademarks of copyright holders may NOT be used in
+ advertising or publicity pertaining to the software without specific,
+ written prior permission. Title to copyright in this software and any
+ associated documentation will at all times remain with copyright
+ holders.
+ </p>
+ </body>
+</html>
View
17 docs/licenses/acknowledgements.txt
@@ -0,0 +1,17 @@
+The uPortal distribution may include a number of other libraries, resources, and products. Intellectual property.
+This folder exists for two reasons. The first reason is that we'd like to acknowledge the important contributions
+these other projects and resources make to our project. The success of this project has been and continues to be dependent upon
+the quality tools and resources produced by others in the Java community.
+
+Some of these projects and resources we include in our distribution are subject to license agreements.
+The second reason for this folder is to provide a place in the distribution where we include the other files necessary for
+our distribution to comply with the terms of these agreements.
+
+We have attempted here to comply with applicable license agreements and give credit where credit is due. If we have overlooked
+acknowledgement of any contribution to this project please bring this to our attention.
+
+
+The JAXP libraries:
+
+We redistribute the JAXP 1.3 endorsed extensions for JDK 1.4 pursuant to our continued support for JDK 1.4. These .jars are
+subject to licenses in this directory including License-ASF.txt, License-W3C.html, and jaxp-binary.txt.
View
47 docs/licenses/jaxp-binary.txt
@@ -0,0 +1,47 @@
+Sun Microsystems, Inc.
+Binary Code License Agreement
+
+READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE MEDIA PACKAGE. BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE TERMS OF THIS AGREEMENT. IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END OF THIS AGREEMENT.
+
+1. LICENSE TO USE. Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer hardware for which the corresponding fee has been paid.
+
+2. RESTRICTIONS. Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by Sun and/or its licensors. Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other than a single copy of Software for archival purposes. Unless enforcement is prohibited by applicable law, you may not modify, decompile, or reverse engineer Software. Licensee acknowledges that Licensed Software is not designed or intended for use in the design, construction, operation or maintenance of any nuclear facility. Sun Microsystems, Inc. disclaims any express or implied warranty of fitness for such uses. No right, title or interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement.
+
+3. LIMITED WARRANTY. Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use. Except for the foregoing, Software is provided "AS IS". Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's option to replace Software media or refund the fee paid for Software.
+
+4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
+
+5. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by you for Software under this Agreement. The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.
+
+6. Termination. This Agreement is effective until terminated. You may terminate this Agreement at any time by destroying all copies of Software. This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement. Upon Termination, you must destroy all copies of Software.
+
+7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be subject to export or import regulations in other countries. You agree to comply strictly with all such laws and regulations and acknowledge that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you.
+
+8. U.S. Government Restricted Rights. If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
+
+9. Governing Law. Any action related to this Agreement will be governed by California law and controlling U.S. federal law. No choice of law rules of any jurisdiction will apply.
+
+10. Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
+
+11. Integration. This Agreement is the entire agreement between you and Sun relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
+
+JAVA API FOR XML PROCESSING (JAXP) 1.3 REFERENCE IMPLEMENTATION
+
+SUPPLEMENTAL LICENSE TERMS
+
+These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively, the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained within the Software.
+
+1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to Section 3 (Java Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of designing, developing and testing your Java applets and applications ("Programs").
+
+2. License to Distribute Software. In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to, Section 3 (Java Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary code form only, provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs and/or Software.
+
+3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java" package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or modification of the classes in the JPI. In the event that you create an additional class and associated API(s) which (i) extends the functionality of the Java platform, and (ii) is exposed to third party software developers for the purpose of developing additional software which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers. You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as "java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation.
+
+4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks inures to Sun's benefit.
+
+5. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement. Source code may not be redistributed unless expressly provided for in this Agreement.
+
+6. Termination for Infringement. Either party may terminate this Agreement immediately should any Software become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right.
+
+For inquiries please contact: Sun Microsystems, Inc. 4150 Network Circle, Santa Clara, California 95054.
+(LFI#142942/Form ID#011801)
View
BIN  docs/uPortal_architecture_overview.pdf
Binary file not shown
View
137 docs/uPortal_properties_overview.txt
@@ -0,0 +1,137 @@
+uPortal Properties
+==================
+
+browser.mappings
+----------------
+Defines a system profile mapping for common browsers. Each properties line assignes a regular expression for the user agent string to a profile id. Note: order in which regexs are listed is important. The code will evaluate each regex from top to bottom, reporting a profile mapping as soon as something matches. That means, that something like Netscape's user agent should be matched last, since the regex for it is more general then that of IE. To optimize the matching process, describe most popular browsers first.
+
+
+EntityPropertyRegistry.xml
+--------------------------
+Defines property finders for portal entities.
+
+
+global_dictionary.properties
+----------------------------
+Translations for portal text.
+
+
+ldap.properties
+---------------
+Configuration for LDAP connection necessary for the use of the SimpleLdapSecuritycontext and CacheLdapSecurityContext security provider.
+
+
+ldap.xml
+--------
+Configuration file for LdapServices that describes multiple LDAP server configurations.
+
+
+Logger.properties
+-----------------
+Configuration file for logging engine. The log level (DEBUG, INFO, WARN, ERROR), log file location, logging syntax, etc. can be controlled.
+
+
+media.properties
+----------------
+Specifies a mapping rule between the value contained in the HTTP request's user-Agent field and a value to be scanned for in XSL stylesheet(s) associated with the XML data. This mapping enables relationships to be defined between client capabilities and stylesheets capable of acting on these capabilities. The rules defined are order-significant. In other words, if the first rule is unsuccessful, the second rule will be tried, etc. The media value "unknown" will be used when no rules are satisfied.
+
+
+mime.properties
+---------------
+Maps browser (media) types to their mime types.
+
+
+PersonDirs.xml
+--------------
+Makes possible a standard way for the uPortal framework and its installed channels to refer to particular person attributes. For example, if a channel wants to display a user's email address, it will look for an attribute called "mail", which appears as an alias in this file. This alias maps to the actual name of the field containing an email address in your data repository. Providing this level of indirection for attribute references makes it possible for organizations to share channels that refer to user's attributes.
+
+
+portal.properties
+-----------------
+This is the main configuration file for uPortal. It contains settings for...
+-caching of content and data structures for optimized performance
+-doctypes settings of markup documents produced by uPortal
+-formatting of markup documnets produced by uPortal
+-default layout templates for new users
+-implementations of uPortal data store interfaces
+-keys for groups service's distinguished groups
+-name finder factory implementations
+-profile management settings
+-method of obtaining database connections
+-default properties for CWebProxy and CGenericXSLT channels
+-object locking and caching settings
+-portal stats recorder implementation and settings
+-thread pool settings
+-permission policy implementation
+
+
+rdbm.properties
+---------------
+Sets the JDBC driver class, URL, user name, and password which is used by the reference implementation of uPortal data storage interfaces.
+
+
+resin.conf
+----------
+Only needed if Resin XSLT transformer is used. uPortal uses Xalan by default.
+
+
+sample-jaas.conf
+----------------
+Used in conjunction with JAASSecurityContext security provider.
+
+
+security.properties
+-------------------
+Defines the security provider or chain of providers that will establish the authentication of a portal user. Also specifies the default authorization implementation.
+
+
+serializer.properties
+---------------------
+Defines a mapping between client browser (media) types and serializer names that should be used with that media.
+So far, the following serializers are supported: XML, HTML, XHTML, WML, and HTML for PalmPilot.
+
+
+services.xml
+------------
+This list of services is processed by org.jasig.portal.services.ExternalServices. When uPortal is started, it will attempt to fire up all the services listed here. Each specification includes a class name, an optional description of initialization method and jndi binding name. External services will initialize each service (by either calling a constructor or an initialization method, if such is provided). If jndi binding name is provided either an instance of the specified class, or an object returned by the intialization method (if such method was specified) will be bound under the portal /services jndi context and distributed to the uPortal channels.
+
+
+worker.properties
+-----------------
+This file configures worker dispatch processors. Workers are used to implement functionality that requires complete control over the output stream, as well as access to the portal internal structures.
+
+
+al/fragments.xml
+-----------------
+Defines layout fragments and their restrictions to be published by the PublishFragment tool. These layout fragments will be incorporated into users' layouts via uPortal's aggregated layout manager.
+
+
+chanpub/*
+---------
+This directory holds the channel definition files which can be published by the ChannelPublisher tool. Each file should be named after the channel definition's fname. For example, if the file defines a channel with an fname equal to "my-channel", then the file should be called "my-channel.xml".
+
+
+db/dbloader.xml
+---------------
+Configuation file for DbLoader tool. Controls whether or not to drop/create/populate tables and whether or not to create a database script based on the SQL statements that are executed. Contains mappings for SQL data types which will override those specified by a jdbc driver.
+
+
+groups/compositeGroupsServices.xml
+----------------------------------
+Defines the sources of information from which the portal should load its groups.
+
+
+groups/LDAPGroupStoreConfig.xml
+-------------------------------
+Specifies the connection info, groups, and queries for the LDAP groups service.
+
+
+groups/PAGSGroupStoreConfig.xml
+-------------------------------
+Specifies the groups and group membership criteria for the Person Attributes Group Service (PAGS)
+
+
+groups/pags.properties
+----------------------
+Specifies the configuration implementation for the PAGS group store.
+
View
102 docs/uPortal_tools_overview.txt
@@ -0,0 +1,102 @@
+uPortal Tools
+=============
+
+Database Loading and Unloading
+------------------------------
+
+The reference implementation of uPortal's data storage interfaces requires a relational database. uPortal provides a tool, DbLoader, to load a relational database with the required uPortal tables and sample data. DbLoader performs the following tasks:
+
+1) Reads in properties/tables.xml file to determine the database schema
+2) Deletes existing tables specified in tables.xml.
+3) Creates the tables specified in tables.xml.
+4) Reads in properties/data.xml file to determine sample data.
+5) Inserts data from data.xml into the newly created tables.
+6) Creates a database script containing all the SQL statements previously executed.
+
+DbLoader can be configured by modifying properties/dbloader.xml. Because DbLoader relies on database metadata supplied by a JDBC driver, it may be necessary (for some combinations of drivers and databases) to supply a datatype mapping inside dbloader.xml. If this is necessary, DbLoader will print an error message with instructions.
+
+Another tool, DbUnload, can read an existing database table and serialize it into an xml file similar to tables.xml. This file can then be used in place of tables.xml to load another database.
+
+The tool DbTest prints out db metadata.
+
+To run DbLoader, type "ant db" from the uPortal base directory.
+To run DbUnload, type "ant dbunload" from the uPortal base directory.
+To run DbTest, type "ant dbtest" from the uPortal base directory.
+
+
+Adding users
+------------
+Data for new users is automatically created provided that the user can authenticate successfully to uPortal. The reference data store includes a table, UP_PERSON_DIR, that simulates a more robust directory store. A new user name and md5-encrypted password can be added to this table with the "md5passwd" tool. To run md5passwd, type "ant md5passwd -Dusername=someUserName" from the uPortal base directory. Then type the password at the prompt. Note that the user's first name, last name, and email address are not handled by md5passwd. These person attributes must be entered into the database with manual SQL statements.
+
+
+Deleting users
+--------------
+Data for portal users is stored in several database tables. User information can be deleted from the portal database using the "DeleteUser" tool. To run DeleteUser, type "ant deluser -Duser=someUserName" from the uPortal base directory.
+
+
+Register Channel Types
+----------------------
+The publishing process makes use of channel publishing documents (.cpd files) to determine what parameters and restrictions on parameters are necessary to collect for the use by a published channel. A set of serveral channel types, each of which references a channel publishing document, is supplied with uPortal. To add additional channel types, it is necessary to use the RegisterChannelTypes tool. To run this tool, type "ant regchantype" followed by a set of parameters. For example:
+
+ ant regchantype
+ -Dclass=org.jasig.portal.channels.CImage
+ -Dname="Image Channel"
+ -Ddescription="Displays image with optional title and subtitle"
+ -Duri=/org/jasig/portal/channels/CImage/CImage.cpd
+
+
+Register Stylesheets
+--------------------
+uPortal comes with a reference structure and theme stylesheet. To change the final rendering of a uPortal layout, it may be necessary to author and install new stylesheets. The RegisterStylesheet tool can be used to install new stylesheets and their accompanying stylesheet description files.
+
+Usage: registerStylesheet -(s|t) [-(u|d)] [stylesheetURI] [stylesheetDescriptionURI] [stylesheetId]
+The stylesheetId must be specified for update and delete operations.
+The URIs must be specified for add and update operations.
+The CLASSPATH environment variable should be set up to include both "uPortal/build" and "uPortal/build/WEB-INF/classes" dirs.
+
+For deployment all stylesheets are moved under the "/stylesheet/" directory, so the URI for a stylesheet will always begin with "/stylesheet/", unless you're specifying a global URL (which is not recommended).
+
+Stylesheet description files (.sdf) are moved to the same location, so their URI should be specified in the same manner. For example to specify a URI for a tab-column.xsl (part of the distribution), use "/stylesheets/org/jasig/portal/layout/tab-column/tab-column.xsl".
+
+Flag specification:
+ -s : process structure stylesheet (either "-t" or "-s" are required on the command line
+ -t : process theme stylesheet (either "-t" or "-s" are required on the command line
+ -u : update stylesheet definition
+ -u : remove stylesheet
+
+
+Publish Channels
+----------------
+As an alternative to using the publishing GUI inside uPortal, one can define, in XML format, a channel definition that represents a published channel. Then the channel publishing tool can publish the channel if it is new, or replace the existing channel if it already exists. The identifier used to determine if a channel has been previously published is the channel "fname" or functional name. To publish all the availabe channel definitions, run "ant pubchan -Dchannel=all". To publish just one channel, supply the channel definition file name: "ant pubchan -Dchannel=myChannel.xml".
+
+
+Layout Fragments Loader
+-----------------------
+With the advent of Aggregated Layouts, a tool is necessary to publish a defined layout fragment into the uPortal database. To run this tool, run "ant pubfragments -DfragmentFile=/properties/al/pushfragments.xml" from the uPortal base directory. The fragment file is an XML file that defines the pushed and pulled fragments and their restrictions.
+
+
+Deploy Portlet Applications
+---------------------------
+uPortal uses the Apache Pluto Portlet Container to manage Portlets. The Portlet Deployer tool deploys one or more Portlet applications, rewriting each application's web.xml file to suit the Pluto environment. To deploy multiple Portlet applications, place the Portlet application WAR files in the lib/portlets directory and run "ant deployPortletApp -DportletApp=all". To deploy just one Portlet application, supply the Portlet application WAR file location: "ant deployPortletApp -DporltetApp=C:/TEMP/myPortlet.war".
+
+
+XSLT Transformation
+-------------------
+Performs an XSLT transformation using uPortal XSLT libraries.
+
+ant RunXSLT -DXmlInput=input.xml -DoutputFile=output.xml -DXslfile=stylesheet.xsl
+
+where XmlInput is the file to be transformed,
+outputFile is where the result should saved and
+Xslfile is the URL of the xsl file to be used in the transform.
+
+
+uPortal 2.2.x and 2.3.x --> 2.4.x Upgrade Tool
+----------------------------------------------
+No upgrade tool is available to migrate a uPortal 2.2.x or 2.3.x installation to a uPortal 2.4 installation. Since the database changes are minimal, it should be relatively easy to perform this upgrade. See the README.txt file for information about database and properties files changes since 2.2.x or 2.3.x.
+
+
+uPortal 2.1.x --> 2.4.x Upgrade Tool
+------------------------------------
+See http://www.uportal.org/implementors/upgrade/upgrade21.html for instructions on using the included upgrade tools.
+
View
19 docs/website/implementors/services/compositeGroupService.html
@@ -298,21 +298,24 @@
is fully assembled.&nbsp; In the reference implementation, the service
name is built up node by node as the composite is composed.&nbsp; <br>
</p>
- <p><span style="font-style: italic;">Group Keys.</span>&nbsp; A
+ <p><span style="font-style: italic;">Group Keys.</span>&nbsp; A
group's composite service key is the concatenation of its
fully-qualified service name and its key in the local service.&nbsp; The
nodes of the service name, and the final node of the name and the local
key, are separated by a <span style="font-style: italic;">node separator</span>.&nbsp;
For example, a group with a local key of "English_Department" in a
-service named "ldap" with a node separator of "%" would have a key of
-"ldap%English_Department".&nbsp; <br>
+service named "ldap" with a node separator of "!" would have a key of
+"ldap!English_Department".&nbsp; <br>
</p>
<p><span style="font-style: italic;">Node Separators.</span>&nbsp;
-The default node separator is the period, or ".", but it can be any <code>String</code>
-not found within the nodes of a group key.&nbsp; For example, if local
-group keys include "Latin.101.Section01" and "chefs@columbia.edu", valid
-separators would include "$", "%", and "@@", but not "." or "@".&nbsp;
-For instructions on changing the node separator see <a
+The default node separator is a String containing a period, or ".", but
+it can be any String not found within the nodes of a group key.&nbsp;
+However, group keys can find their way into portal content and urls
+and are subject to xsl transformations. Therefore, the separator should not
+contain a character like '%' that has a special meaning and must be escaped
+to preserve its literal value. If local group keys include "Latin.101.Section01"
+and "chefs@columbia.edu", valid separators would include "$", and "_x", but not
+"." or "@".&nbsp; For instructions on changing the node separator see <a
href="#Configuring_the_Composite">Configuring the Composite</a>.&nbsp; <br>
</p>
<p><span style="font-style: italic;">Groups and their Service
View
35 docs/website/implementors/services/compositeGroupService_prt.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
<head>
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
@@ -259,23 +259,26 @@
reference implementation, the service name is built up node by node as
the composite is composed.&nbsp; <br>
</p>
-<p><span style="font-style: italic;">Group Keys.</span>&nbsp; A group's
-composite service key is the concatenation of its fully-qualified
-service name and its key in the local service.&nbsp; The nodes of the
-service name, and the final node of the name and the local key, are
-separated by a <span style="font-style: italic;">node separator</span>.&nbsp;
+ <p><span style="font-style: italic;">Group Keys.</span>&nbsp; A
+group's composite service key is the concatenation of its
+fully-qualified service name and its key in the local service.&nbsp; The
+nodes of the service name, and the final node of the name and the local
+key, are separated by a <span style="font-style: italic;">node separator</span>.&nbsp;
For example, a group with a local key of "English_Department" in a
-service named "ldap" with a node separator of "%" would have a key of
-"ldap%English_Department".&nbsp; <br>
-</p>
-<p><span style="font-style: italic;">Node Separators.</span>&nbsp; The
-default node separator is the period, or ".", but it can be any <code>String</code>
-not found within the nodes of a group key.&nbsp; For example, if local
-group keys include "Latin.101.Section01" and "chefs@columbia.edu", valid
-separators would include "$", "%", and "@@", but not "." or "@".&nbsp;
-For instructions on changing the node separator see <a
+service named "ldap" with a node separator of "!" would have a key of
+"ldap!English_Department".&nbsp; <br>
+ </p>
+ <p><span style="font-style: italic;">Node Separators.</span>&nbsp;
+The default node separator is a String containing a period, or ".", but
+it can be any String not found within the nodes of a group key.&nbsp;
+However, group keys can find their way into portal content and urls
+and are subject to xsl transformations. Therefore, the separator should not
+contain a character like '%' that has a special meaning and must be escaped
+to preserve its literal value. If local group keys include "Latin.101.Section01"
+and "chefs@columbia.edu", valid separators would include "$", and "_x", but not
+"." or "@".&nbsp; For instructions on changing the node separator see <a
href="#Configuring_the_Composite">Configuring the Composite</a>.&nbsp; <br>
-</p>
+ </p>
<p><span style="font-style: italic;">Groups and their Service Names.</span>&nbsp;
The significance of the service name in a group key is that it
directs us to the specific service that can answer the request for the
View
122 etc/quickstart/README.txt
@@ -0,0 +1,122 @@
+$Id$
+
+uPortal Quick-Start Distribution
+--------------------------------------
+
+Purpose
+-------
+This quick-start release distribution is provided
+for those who want to get familiar with uPortal
+quickly and easily, without having to compile and
+deploy code, and without having to set up a database.
+
+
+Contents
+--------
+1) uPortal 2.4.2
+2) Tomcat 5.0.28
+3) HSQLDB 1.7.2.4
+4) Ant 1.6.2
+
+
+System requirements
+-------------------
+JDK 1.4 or higher.
+JDK must include tools.jar.
+JAVA_HOME environment variable must be set to a path that does not contain spaces.
+Nothing else should be running on port 8005, 8080 and 8887.
+Path to uPortal_2-4-quick-start folder should not contain spaces.
+
+
+Instructions
+------------
+For the commands below, the 'ant' command depends on
+your operating system:
+Windows: ant.bat
+UNIX: ant.sh
+
+To start uPortal, you must first start HSQLDB by typing:
+
+ant hsql
+
+Next start Tomcat by typing:
+
+ant tomcatstart
+
+You may need to enter each command
+in a separate console window.
+
+Once HSQLDB and Tomcat are running, you can access
+uPortal with your browser by entering the following URL:
+
+http://localhost:8080/uPortal/
+
+You can login to uPortal with the following user name/password
+combinations:
+
+demo, demo
+student, student
+faculty, faculty
+staff, staff
+developer, developer
+
+To stop uPortal, first stop Tomcat by typing
+
+ant tomcatstop
+
+Then stop Hypersonic SQL by
+typing
+
+CTRL-C
+
+in the window in which it was started.
+
+
+Notes
+-----
+-uPortal binaries are included so there is no
+ need to compile any uPortal source code. Also, the
+ database is pre-loaded, so there is no need to run
+ any database scripts. A separate build.xml file
+ exists in the uPortal sub-directory which can be
+ used to deploy uPortal if you make any changes to
+ its source code or properties files. The included
+ binaries where compiled with JDK 1.4.2-b28.
+
+-Connection pooling is set up by Tomcat.
+ For more information about Tomcat's conneciton
+ pooling configuration, see
+ http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jndi-datasource-examples-howto.html
+
+-Log messages for uPortal appear in
+ portal.log which appears in the current java working
+ directory which is typically the same directory that
+ this README.txt file is in.
+
+-If you are attempting to run uPortal in an environment
+ that requires a proxy server to make http requests outside
+ the firewall, you may need to configure the proxy host
+ and port for your JVM. This can be done by modifying the
+ build.xml file by adding the following lines in the
+ tomcatstart target element below the catalina.home
+ sysproperty element:
+ <sysproperty key="http.proxyHost" value="YOUR_PROXY_HOST"/>
+ <sysproperty key="http.proxyPort" value="YOUR_PROXY_PORT"/>
+
+
+Please report bugs and suggestions:
+
+ http://www.uportal.org/bugzilla/
+
+uPortal website:
+
+ http://www.uportal.org/
+
+
+Changes since last release
+-------------------------
+See ./uPortal_rel-X-X-X/README.txt
+
+This quick-start distribution now contains jta.jar
+so that certain tools will run without an available
+JNDI context.
View
2  etc/quickstart/ant.bat
@@ -0,0 +1,2 @@
+set ANT_HOME=./Ant_1-6-2
+./Ant_1-6-2/bin/ant.bat %1
View
4 etc/quickstart/ant.sh
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+ANT_HOME=./Ant_1-6-2
+./Ant_1-6-2/bin/ant $@
View
77 etc/quickstart/build.xml
@@ -0,0 +1,77 @@
+<!--
+ $Id$
+ This build.xml contains targets for starting HSQLDB
+ (which listens on port 8887)
+ and starting and stopping Tomcat 5.0.28.
+-->
+
+<project name="uPortal_Quick_Start" default="help" basedir=".">
+
+ <property environment="env"/>
+
+
+<!--
+ The "hsql" target starts HSQLDB
+-->
+
+ <target name="hsql">
+ <echo message="Starting HSQLDB"/>
+ <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
+ <classpath>
+ <pathelement path="${basedir}/HSQLDB_1-7-2-4/lib/hsqldb.jar"/>
+ </classpath>
+ <arg value="-database"/>
+ <arg value="${basedir}/HSQLDB_1-7-2-4/demo/uPortal"/>
+ <arg value="-port"/>
+ <arg value="8887"/>
+ </java>
+ </target>
+
+<!--
+ The "tomcatstart" target starts Tomcat
+-->
+
+ <target name="tomcatstart">
+ <echo message="Starting Tomcat 5.0.28"/>
+ <java fork="true" dir="${basedir}" classname="org.apache.catalina.startup.Bootstrap">
+ <classpath>
+ <pathelement path="${basedir}/Tomcat_5-0-28/bin/bootstrap.jar"/>
+ <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
+ </classpath>
+ <sysproperty key="catalina.home" value="${basedir}/Tomcat_5-0-28"/>
+ <arg value="start"/>
+ </java>
+ </target>
+
+<!-- ==================== tomcatstop Target ================================ -->
+
+<!--
+
+ The "tomcat" target stops Tomcat
+
+-->
+
+
+ <target name="tomcatstop">
+ <echo message="Stopping Tomcat 5.0.28"/>
+ <java fork="true" dir="${basedir}" classname="org.apache.catalina.startup.Bootstrap">
+ <classpath>
+ <pathelement path="${basedir}/Tomcat_5-0-28/bin/bootstrap.jar"/>
+ </classpath>
+ <sysproperty key="catalina.home" value="${basedir}/Tomcat_5-0-28"/>
+ <!--jvmarg value="-Dcatalina.home=${basedir}/Tomcat_5-0-28"/-->
+ <arg value="stop"/>
+ </java>
+ </target>
+
+<!--
+ The "help" target prints a help message
+-->
+
+ <target name="help">
+ <echo message="Please read the README file which explains how to operate this uPortal quick-start package"/>
+ <echo message="To see the possible ant targets, type 'ant -projecthelp'"/>
+ </target>
+
+
+</project>
View
5 etc/quickstart/fix-unix-modes.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+chmod 755 .
+find . -type d -exec chmod 755 {} \;
+find . -type f -exec chmod 644 {} \;
+find . -type f -name \*.sh -exec chmod 755 {} \;
View
55 etc/uportal-quickstart-dist.sh
@@ -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
64 etc/uportal-source-dist.sh
@@ -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
View
BIN  lib/backport-util-concurrent.jar
Binary file not shown
View
48 lib/jaxp/README.txt
@@ -0,0 +1,48 @@
+What is this file?
+
+This README documents why these JAXP 1.3 jars are here in this folder and what you should do with them.
+
+The short version:
+
+If compiling and deploying under JDK 1.4.x, drop these .jar files into your /lib/endorsed/ directory of your JDK's JRE
+and into the /commmon/endorsed/ directory of your Tomcat.
+The 'JAXP-Install' target in the uPortal build.xml will do this for you.
+
+You also need to copy /lib/xalan-2-6-0.jar to the /lib/endorsed/ directory of your JDK's JRE
+and into the /common/endorsed/ directory of your Tomcat. xalan-2-6-0.jar overrides
+the org.apache.xml APIs that were included in JDK 1.4.
+
+If using JDK 1.5:
+
+You don't need this folder at all if you're running JDK 1.5 as both
+your development environment and your Tomcat environment.
+
+You will still need to make /lib/xalan-2-6-0.jar available to provide the org.apache.xml APIs.
+
+What are these jars?
+
+These are the JAXP 1.3 jars. They implement an endorsed extension to the JDK 1.4.x environment.
+They provide a way to bridge from the JDK 1.4 world to the JDK 1.5 world. These jars include support
+for standardized XML parsing, transformations, and DOM Level 3 Documents.
+
+
+Under what licenses are these .jars distributed?
+
+See /docs/licenses/acknowledgements.txt. See also the Java.net site where these .jars are distributed.
+
+https://jaxp.dev.java.net/
+
+
+
+Where can I read more?
+
+http://jasigch.princeton.edu:9000/display/UPC/Practical+uP25+XML+Changes
+
+http://jasigch.princeton.edu:9000/display/UPC/XML+API+standardization
+
+
+
+What JDK should I be using?
+
+While the uPortal 2.5 release is committed to continuing to support JDK 1.4,
+you might still want to go ahead and use JDK 1.5 if at all possible.
View
BIN  lib/jaxp/dom.jar
Binary file not shown
View
BIN  lib/jaxp/jaxp-api.jar
Binary file not shown
View
BIN  lib/jaxp/sax.jar
Binary file not shown
View
BIN  lib/jaxp/xalan.jar
Binary file not shown
View
BIN  lib/jaxp/xercesImpl.jar
Binary file not shown
View
BIN  lib/pluto-1.0.1.jar → lib/pluto-1.0.1-rc1.jar
Binary file not shown
View
BIN  lib/portlets/RssPortlet.war
Binary file not shown
View
BIN  lib/portlets/proxyportlet.war
Binary file not shown
View
BIN  lib/portlets/testsuite.war
Binary file not shown
View
0  lib/xalan.jar → lib/xalan-2-6-0.jar
File renamed without changes
View
3  properties/Logger.properties
@@ -1,6 +1,9 @@
###########################################################################
# Properties file for the log4j logger system
#
+# Note: During the uPortal build, the file at /properties/Logger.properties is copied
+# to the log4j standard location /WEB-INF/classes/log4j.properties . This means that editing the file
+# at /properties/Logger.properties in a deployed uPortal will have no effect.
#
# Please read the instructions for the Log4J logging system at
# http://jakarta.apache.org/log4j/ if you want to modify this.
View
6 properties/PersonDirs.xml
@@ -87,7 +87,7 @@
<logonid>sa</logonid>
<logonpassword></logonpassword>
- <uidquery>SELECT FIRST_NAME||' '||LAST_NAME AS FIRST_LAST, FIRST_NAME, LAST_NAME, EMAIL FROM UP_PERSON_DIR WHERE USER_NAME=?</uidquery>
+ <uidquery>SELECT FIRST_NAME, LAST_NAME, EMAIL FROM UP_PERSON_DIR WHERE USER_NAME=?</uidquery>
<attributes>
@@ -100,7 +100,7 @@
<attribute><alias>c</alias> <name></name></attribute>
<attribute><alias>cn</alias> <name></name></attribute>
<attribute><alias>description</alias> <name></name></attribute>
- <attribute><alias>displayName</alias> <name>FIRST_LAST</name></attribute>
+ <attribute><alias>displayName</alias> <name>FIRST_NAME</name></attribute>
<attribute><alias>facsimileTelephoneNumber</alias> <name></name></attribute>
<attribute><alias>givenName</alias> <name>FIRST_NAME</name></attribute>
<attribute><alias>homePhone</alias> <name></name></attribute>
@@ -211,6 +211,7 @@
<url>ldap://yu.yale.edu:389/dc=itstp, dc=yale, dc=edu</url>
<logonid>cn=bogus,cn=Users,dc=itstp,dc=yale,dc=edu</logonid>
<logonpassword>foobar</logonpassword>
+ <usercontext>cn=Users</usercontext>
2) Specify the name of an LDAP server as set up in uPortal's ldap.xml. For example,
@@ -223,7 +224,6 @@
<ldap-ref-name>Main</ldap-ref-name>
<uidquery>(cn={0})</uidquery>
- <usercontext>cn=Users</usercontext>
<attributes>
View
21 properties/al/fragments.xml
@@ -85,6 +85,27 @@
</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="timetitle" immutable="Y" unremovable="Y" hidden="N"/>
+ </folder>
+ </folder>
+ </fragment>
+
<fragment name="Portlet-examples" type="pushed">
<description>Channels that demonstrate the portlet adapter</description>
View
33 properties/chanpub/timetitle.xml
@@ -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
4 properties/db/data.xml
@@ -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>4</value></column>
- <column><name>MICRO</name><value>0</value></column>
+ <column><name>MICRO</name><value>4</value></column>
<column><name>DESCRIPTION</name><value>The uPortal Framework.</value></column>
</row>
</rows>
@@ -1257,7 +1257,7 @@
<column><name>CHAN_ID</name><value>9</value&g