Permalink
Browse files

This commit was manufactured by cvs2svn to create tag 'rel-2-3-5'.

git-svn-id: https://source.jasig.org/uPortal/tags/rel-2-3-5@9226 f5dbab47-78f9-eb45-b975-e544023573eb
  • Loading branch information...
1 parent 9af8b8c commit 4015796961a36878bbda6ae5741212ef7c4c924b infrastructure@lists.ja-sig.org committed Sep 24, 2004
Showing with 7,139 additions and 5,030 deletions.
  1. +2 −56 .cvsignore
  2. +2 −2 build.properties
  3. +1 −0 build.xml
  4. +0 −1 lib/.cvsignore
  5. +31 −0 properties/chanpub/contentsubscriber.xml
  6. +1 −1 properties/chanpub/rss-portlet.xml
  7. +31 −0 properties/chanpub/skinselector.xml
  8. +59 −59 properties/db/data.xml
  9. +53 −53 properties/db/tables.xml
  10. +3 −7 properties/groups/compositeGroupServices.xml
  11. +6 −0 properties/groups/pags.properties
  12. +9 −9 properties/portal.properties
  13. +4 −0 properties/uPortal.xml
  14. +0 −119 scripts/createTables-hypersonic.script
  15. +0 −15 scripts/dropTables.script
  16. +0 −269 scripts/populateTables.script
  17. +0 −2 source/.cvsignore
  18. +8 −5 source/org/jasig/portal/ChannelDefinition.java
  19. +1 −1 source/org/jasig/portal/ChannelManager.java
  20. +7 −11 source/org/jasig/portal/ChannelRegistryManager.java
  21. +3 −4 source/org/jasig/portal/ChannelRuntimeData.java
  22. +16 −3 source/org/jasig/portal/DownloadDispatchWorker.java
  23. +16 −9 source/org/jasig/portal/HttpProxyServlet.java
  24. +10 −1 source/org/jasig/portal/LdapServices.java
  25. +10 −0 source/org/jasig/portal/LoginServlet.java
  26. +15 −16 source/org/jasig/portal/LogoutServlet.java
  27. +15 −7 source/org/jasig/portal/MediaManager.java
  28. +20 −0 source/org/jasig/portal/MultipartDataSource.java
  29. +15 −5 source/org/jasig/portal/PortalSessionManager.java
  30. +3 −5 source/org/jasig/portal/PropertiesManager.java
  31. +2 −1 source/org/jasig/portal/RDBMChannelRegistryStore.java
  32. +77 −23 source/org/jasig/portal/RDBMServices.java
  33. +730 −404 source/org/jasig/portal/RDBMUserIdentityStore.java
  34. +386 −155 source/org/jasig/portal/RDBMUserLayoutStore.java
  35. +19 −11 source/org/jasig/portal/RequestParamWrapper.java
  36. +6 −1 source/org/jasig/portal/StylesheetSet.java
  37. +13 −8 source/org/jasig/portal/StylesheetUserPreferences.java
  38. +12 −5 source/org/jasig/portal/UPFileSpec.java
  39. +17 −16 source/org/jasig/portal/UserInstance.java
  40. +2 −1 source/org/jasig/portal/UserPreferencesManager.java
  41. +16 −2 source/org/jasig/portal/car/CarClassLoader.java
  42. +14 −2 source/org/jasig/portal/car/CarResourceWorker.java
  43. +1 −1 source/org/jasig/portal/car/CarResources.java
  44. +12 −0 source/org/jasig/portal/car/DescriptorHandler.java
  45. +11 −2 source/org/jasig/portal/channels/CGenericXSLT.java
  46. +2 −4 source/org/jasig/portal/channels/CLogin.java
  47. +13 −3 source/org/jasig/portal/channels/UserPreferences/ManageProfilesState.java
  48. +105 −11 source/org/jasig/portal/channels/UserPreferences/TabColumnPrefsState.java
  49. +9 −7 source/org/jasig/portal/channels/permissionsmanager/RDBMPermissibleRegistry.java
  50. +40 −6 source/org/jasig/portal/channels/portlet/CPortletAdapter.java
  51. +10 −0 source/org/jasig/portal/channels/portlet/ChannelData.java
  52. +30 −14 source/org/jasig/portal/channels/webproxy/CWebProxy.java
  53. +35 −2 source/org/jasig/portal/container/binding/PortletApplicationUnmarshaller.java
  54. +22 −16 source/org/jasig/portal/container/binding/WebApplicationUnmarshaller.java
  55. +2 −0 source/org/jasig/portal/container/deploy/Deployer.java
  56. +1 −1 source/org/jasig/portal/container/deploy/WebAppDtdResolver.java
  57. +0 −13 source/org/jasig/portal/container/om/common/ObjectIDImpl.java
  58. +3 −3 source/org/jasig/portal/container/om/common/SecurityRoleRefSetImpl.java
  59. +1 −1 source/org/jasig/portal/container/om/common/SecurityRoleSetImpl.java
  60. +2 −1 source/org/jasig/portal/container/om/portlet/ContentTypeImpl.java
  61. +11 −2 source/org/jasig/portal/container/om/portlet/PortletApplicationDefinitionImpl.java
  62. +64 −0 source/org/jasig/portal/container/om/portlet/UserAttributeImpl.java
  63. +68 −0 source/org/jasig/portal/container/om/portlet/UserAttributeListImpl.java
  64. +0 −7 source/org/jasig/portal/container/om/servlet/WebApplicationDefinitionImpl.java
  65. +14 −8 source/org/jasig/portal/container/services/information/InformationProviderServiceImpl.java
  66. +17 −7 source/org/jasig/portal/container/services/information/PortletStateManager.java
  67. +2 −3 source/org/jasig/portal/container/services/information/ResourceURLProviderImpl.java
  68. +34 −1 source/org/jasig/portal/container/services/information/StaticInformationProviderImpl.java
  69. +8 −3 source/org/jasig/portal/container/servlet/ServletRequestImpl.java
  70. +15 −4 source/org/jasig/portal/groups/PersonDirNameFinder.java
  71. +48 −12 source/org/jasig/portal/groups/filesystem/FileSystemGroupStore.java
  72. +8 −1 source/org/jasig/portal/groups/ldap/LDAPGroupStore.java
  73. +14 −7 source/org/jasig/portal/groups/local/searchers/RDBMPersonSearcher.java
  74. +57 −0 source/org/jasig/portal/groups/pags/IPersonAttributesConfiguration.java
  75. +46 −137 source/org/jasig/portal/groups/pags/PersonAttributesGroupStore.java
  76. +172 −0 source/org/jasig/portal/groups/pags/XMLPersonAttributesConfiguration.java
  77. +1 −1 source/org/jasig/portal/i18n/LocaleAwareXSLT.java
  78. +4 −4 source/org/jasig/portal/i18n/LocaleManager.java
  79. +440 −364 source/org/jasig/portal/layout/AggregatedLayoutManager.java
  80. +83 −40 source/org/jasig/portal/layout/AggregatedUserLayoutStore.java
  81. +4 −5 source/org/jasig/portal/layout/channels/CContentSubscriber.java
  82. +1 −1 source/org/jasig/portal/layout/channels/CFragmentManager.java
  83. +14 −2 source/org/jasig/portal/layout/channels/CSkinSelector.java
  84. +2 −13 source/org/jasig/portal/layout/channels/locales/CSessionLocalesSelector.java
  85. +0 −174 source/org/jasig/portal/layout/utils/ALMigrationUtil.java
  86. +33 −24 source/org/jasig/portal/layout/utils/PushFragmentLoader.java
  87. +0 −40 source/org/jasig/portal/layout/utils/README.txt
  88. +0 −20 source/org/jasig/portal/layout/utils/target.xml
  89. +171 −80 source/org/jasig/portal/security/InitialSecurityContextFactory.java
  90. +7 −0 source/org/jasig/portal/security/provider/ChainingSecurityContext.java
  91. +14 −8 source/org/jasig/portal/security/provider/ReferenceAuthorization.java
  92. +10 −19 source/org/jasig/portal/security/provider/RemoteUserPersonManager.java
  93. +1 −0 source/org/jasig/portal/serialize/CachingHTMLSerializer.java
  94. +1 −0 source/org/jasig/portal/serialize/CachingXHTMLSerializer.java
  95. +9 −2 source/org/jasig/portal/services/AuthorizationService.java
  96. +8 −1 source/org/jasig/portal/services/ExternalServices.java
  97. +57 −34 source/org/jasig/portal/services/PersonDirectory.java
  98. +25 −16 source/org/jasig/portal/services/StatsRecorder.java
  99. +13 −0 source/org/jasig/portal/services/entityproperties/PersonDirPropertyFinder.java
  100. +4 −1 source/org/jasig/portal/tools/ChannelServlet.java
  101. +223 −0 source/org/jasig/portal/tools/ConvertProfilesToAL.java
  102. +233 −0 source/org/jasig/portal/tools/DbConvert21.java
  103. +1 −63 source/org/jasig/portal/tools/DeleteUser.java
  104. +255 −0 source/org/jasig/portal/tools/SimpleLayout2ALIM.java
  105. +1 −1 source/org/jasig/portal/tools/chanpub/ChannelDefDtdResolver.java
  106. +68 −22 source/org/jasig/portal/tools/chanpub/ChannelPublisher.java
  107. +97 −10 source/org/jasig/portal/tools/dbloader/DbLoader.java
  108. +24 −8 source/org/jasig/portal/utils/CommonUtils.java
  109. +0 −14 source/org/jasig/portal/utils/DocumentFactory.java
  110. +38 −16 source/org/jasig/portal/utils/PortalDocumentImpl.java
  111. +157 −71 source/org/jasig/portal/utils/RDBMCounterStore.java
  112. +32 −11 source/org/jasig/portal/utils/ResourceLoader.java
  113. +19 −7 source/org/jasig/portal/utils/URLUtil.java
  114. +13 −2 source/org/jasig/portal/utils/XSLT.java
  115. +2 −3 source/org/jasig/portal/wsrp/ChannelInstanceManager.java
  116. +3 −6 tests/org/jasig/portal/layout/SimpleUserLayoutManagerTest.java
  117. +10 −1 tests/org/jasig/portal/security/provider/AuthorizationTester.java
  118. +128 −0 upgrade21.xml
  119. +0 −1 webpages/.cvsignore
  120. +1 −1 webpages/dtd/PAGSGroupStore.dtd
  121. +6 −3 webpages/dtd/channelDefinition.dtd
  122. +2 −2 webpages/media/org/jasig/portal/channels/CGenericXSLT/CGenericXSLT.cpd
  123. +0 −6 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Entries
  124. +0 −1 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Repository
  125. +0 −1 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Root
  126. +1 −1 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_sv_SE.xsl
  127. +1 −1 webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/footer/footer_webbrowser.xsl
  128. +72 −60 webpages/stylesheets/org/jasig/portal/channels/CUserPreferences/tab-column/default.xsl
  129. +3 −2 webpages/stylesheets/org/jasig/portal/channels/CUserPreferences/tab-column/default_en_US.xsl
  130. +3 −2 webpages/stylesheets/org/jasig/portal/channels/CUserPreferences/tab-column/default_it_IT.xsl
  131. +3 −2 webpages/stylesheets/org/jasig/portal/channels/CUserPreferences/tab-column/default_ja_JP.xsl
  132. +3 −2 webpages/stylesheets/org/jasig/portal/channels/CUserPreferences/tab-column/default_lv_LV.xsl
  133. +3 −2 webpages/stylesheets/org/jasig/portal/channels/CUserPreferences/tab-column/default_sv_SE.xsl
  134. +3 −2 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/AL_TabColumn.xsl
  135. +10 −6 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes.xsl
  136. +2 −0 ...s/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes.xsl.en_US.dict
  137. +1 −1 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes_de_DE.xsl
  138. +2,272 −2,270 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes_en_US.xsl
  139. +1 −1 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes_ja_JP.xsl
  140. +2 −2 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes_lv_LV.xsl
  141. +1 −1 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes_sv_SE.xsl
  142. +1 −1 webpages/stylesheets/org/jasig/portal/layout/tab-column/nested-tables/nested-tables.xsl
  143. +30 −9 webpages/stylesheets/org/jasig/portal/tools/dbloader/tables.xsl
View
@@ -1,60 +1,6 @@
-control_panel
build
dist
-localbuild.properties.in
-logs
-scripts
-hsql
-defaultroot
-bak
-work
-.cvspass
-jBuilderBackups
-*.jpx*
-classes
-doc
-docs
-01-logs
-02-logs
-03-logs
-04-logs
-05-logs
-06-logs
-07-logs
-08-logs
-09-logs
-portal.jpx
-.DS_Store
-01-portal.log
-02-portal.log
-03-portal.log
-04-portal.log
-05-portal.log
-06-portal.log
-07-portal.log
-08-portal.log
-09-portal.log
-10-portal.log
-Servlet.library
-portal-clean.jpx
-portal.log
-external portal libs.library
-uPortal20.jpx
-.DS_Store
-.#build.xml.1.12
-0Bak_build.xml
-Tomcat
.project
.classpath
-libs
-deploy
-lib
-.#build.properties.1.25
-.#build.properties.1.26
-uPortal.jpx
-uPortal.oif
-webpages.war
-tests
-.#build.properties.1.27
-.#build.properties.1.28
-server.xml
+.cvspass
+portal.log
View
@@ -15,10 +15,10 @@
#==================== File and Directory Names ========================
app.name=uPortal
-app.version=2.2+
+app.version=2.3.5
lib.path=lib
-server.home=C:/JavaClasses/jakarta-tomcat-5.0.18
+server.home=/JavaClasses/jakarta-tomcat-5.0.18
deploy.home=${server.home}/webapps/uPortal
View
@@ -1253,4 +1253,5 @@
<arg value="${portletApp}"/>
</java>
</target>
+
</project>
View
@@ -1 +0,0 @@
-classes12-Oracle9.2.0.3.jar
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE channel-definition SYSTEM "channelDefinition.dtd">
+
+<channel-definition>
+
+ <title>Content Subscriber</title>
+ <name>Content Subscriber</name>
+ <fname>contentsubscriber</fname>
+ <desc>Content Subscriber channel</desc>
+ <type>Custom</type>
+ <class>org.jasig.portal.layout.channels.CContentSubscriber</class>
+ <timeout>5000</timeout>
+
+ <hasedit>N</hasedit>
+ <hashelp>N</hashelp>
+ <hasabout>N</hasabout>
+
+ <secure>N</secure>
+ <locale>en_US</locale>
+
+ <categories>
+ </categories>
+
+ <groups>
+ <group>Everyone</group>
+ </groups>
+
+ <parameters/>
+
+</channel-definition>
@@ -17,7 +17,7 @@
<class>org.jasig.portal.channels.portlet.CPortletAdapter</class>
<timeout>60000</timeout>
- <hasedit>N</hasedit>
+ <hasedit>Y</hasedit>
<hashelp>Y</hashelp>
<hasabout>N</hasabout>
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE channel-definition SYSTEM "channelDefinition.dtd">
+
+<channel-definition>
+
+ <title>Skin Selector</title>
+ <name>Skin Selector</name>
+ <fname>skinselector</fname>
+ <desc>Skin Selector channel</desc>
+ <type>Custom</type>
+ <class>org.jasig.portal.layout.channels.CSkinSelector</class>
+ <timeout>5000</timeout>
+
+ <hasedit>N</hasedit>
+ <hashelp>N</hashelp>
+ <hasabout>N</hasabout>
+
+ <secure>N</secure>
+ <locale>en_US</locale>
+
+ <categories>
+ </categories>
+
+ <groups>
+ <group>Everyone</group>
+ </groups>
+
+ <parameters/>
+
+</channel-definition>
Oops, something went wrong. Retry.

0 comments on commit 4015796

Please sign in to comment.