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-3-5'.

git-svn-id: https://source.jasig.org/uPortal/tags/rel-2-3-5@9226 f5dbab47-78f9-eb45-b975-e544023573eb
  • Loading branch information...
commit 4015796961a36878bbda6ae5741212ef7c4c924b 1 parent 9af8b8c
infrastructure@lists.ja-sig.org authored
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  webpages/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
58 .cvsignore
@@ -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
4 build.properties
@@ -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
1  build.xml
@@ -1253,4 +1253,5 @@
<arg value="${portletApp}"/>
</java>
</target>
+
</project>
View
1  lib/.cvsignore
@@ -1 +0,0 @@
-classes12-Oracle9.2.0.3.jar
View
31 properties/chanpub/contentsubscriber.xml
@@ -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>
View
2  properties/chanpub/rss-portlet.xml
@@ -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>
View
31 properties/chanpub/skinselector.xml
@@ -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>
View
118 properties/db/data.xml
@@ -3,7 +3,7 @@
<data>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_RESTRICTIONS</name>
<rows>
<row>
@@ -45,7 +45,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_OWNER_FRAGMENT</name>
<rows>
<row>
@@ -67,7 +67,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_USER_LAYOUT_AGGR</name>
<rows>
<row>
@@ -109,7 +109,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_LAYOUT_STRUCT_AGGR</name>
<rows>
<!-- Guest layout -->
@@ -139,7 +139,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_FRAGMENTS</name>
<rows>
<!-- Fragment examples -->
@@ -305,7 +305,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_GROUP_FRAGMENT</name>
<rows>
<!-- An example of fragment parameters -->
@@ -321,7 +321,7 @@
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_FRAGMENT_RESTRICTIONS</name>
<rows>
<row>
@@ -348,7 +348,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_LAYOUT_RESTRICTIONS</name>
<rows>
<row>
@@ -378,7 +378,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_GROUP_PRIORITY_RANGE</name>
<rows>
<row>
@@ -409,7 +409,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SEQUENCE</name>
<rows>
<row>
@@ -448,14 +448,14 @@
<column><name>SEQUENCE_NAME</name><value>UP_ENTITY_CACHE</value></column>
<column><name>SEQUENCE_VALUE</name><value>0</value></column>
</row>
- <row>
+ <row sinceMajor="2" sinceMinor="2">
<column><name>SEQUENCE_NAME</name><value>UP_FRAGMENT</value></column>
<column><name>SEQUENCE_VALUE</name><value>10</value></column>
</row>
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_USER</name>
<rows>
<row>
@@ -466,7 +466,7 @@
<column><name>USER_ID</name><value>1</value></column>
<column><name>USER_NAME</name><value>guest</value></column>
<column><name>USER_DFLT_USR_ID</name><value>NULL</value></column>
- <column><name>USER_DFLT_LAY_ID</name><value>NULL</value></column>
+ <column><name>USER_DFLT_LAY_ID</name><value>1</value></column>
<column><name>NEXT_STRUCT_ID</name><value>30</value></column>
</row>
<row>
@@ -516,7 +516,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_PERSON_DIR</name>
<rows>
<!-- The row below will add the guest user to the UP_PERSON_DIR table with the password = 'demo' -->
@@ -577,7 +577,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_CHANNEL</name>
<rows>
<row>
@@ -1047,7 +1047,7 @@
<column><name>CHAN_FNAME</name><value>permissionsmanager</value></column>
<column><name>CHAN_SECURE</name><value>N</value></column>
</row>
- <row>
+ <row sinceMajor="2" sinceMinor="2">
<column><name>CHAN_ID</name><value>96</value></column>
<column><name>CHAN_TITLE</name><value>Session Locale Selector</value></column>
<column><name>CHAN_NAME</name><value>Session Locale Selector</value></column>
@@ -1083,7 +1083,7 @@
<column><name>CHAN_FNAME</name><value>portal/login/general</value></column>
<column><name>CHAN_SECURE</name><value>N</value></column>
</row>
- <row>
+ <row sinceMajor="2" sinceMinor="2">
<column><name>CHAN_ID</name><value>80</value></column>
<column><name>CHAN_TITLE</name><value>SkinSelector</value></column>
<column><name>CHAN_NAME</name><value>Skin Selector</value></column>
@@ -1100,7 +1100,7 @@
<column><name>CHAN_HAS_ABOUT</name><value>Y</value></column>
<column><name>CHAN_FNAME</name><value>skinselector</value></column>
</row>
- <row>
+ <row sinceMajor="2" sinceMinor="2">
<column><name>CHAN_ID</name><value>81</value></column>
<column><name>CHAN_TITLE</name><value>ContentSubscriber</value></column>
<column><name>CHAN_NAME</name><value>Content Subscriber</value></column>
@@ -1120,7 +1120,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_CHANNEL_PARAM</name>
<rows>
<!-- Daily Business Channel -->
@@ -1556,7 +1556,7 @@
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_USER_LAYOUT</name>
<rows>
<row>
@@ -1598,7 +1598,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_LAYOUT_STRUCT</name>
<rows>
<!-- Guest layout -->
@@ -2816,7 +2816,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_LAYOUT_PARAM</name>
<rows>
<!-- An example of how a user can override the dafault value of a channel parameter -->
@@ -2847,7 +2847,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_CHAN_TYPE</name>
<rows>
<row>
@@ -2893,9 +2893,9 @@
<row>
<column><name>TYPE_ID</name><value>5</value></column>
<column><name>TYPE_NAME</name><value>WSRP Consumer</value></column>
- <column><name>TYPE</name><value>org.jasig.portal.channels.wsrp.CConsumer</value></column>
+ <column><name>TYPE</name><value>org.jasig.portal.channels.portlet.CPortletAdapter</value></column>
<column><name>TYPE_DESCR</name><value>WSRP consumer implementation</value></column>
- <column><name>TYPE_DEF_URI</name><value>/org/jasig/portal/channels/wsrp/CConsumer.cpd</value></column>
+ <column><name>TYPE_DEF_URI</name><value>/org/jasig/portal/channels/portlet/wsrp-consumer.cpd</value></column>
</row>
<row>
@@ -2906,8 +2906,8 @@
<column><name>TYPE_DEF_URI</name><value>/org/jasig/portal/channels/CApplet/CApplet.cpd</value></column>
</row>
- <row>
- <column><name>TYPE_ID</name><value>7</value></column>
+ <row sinceMajor="2" sinceMinor="2">
+ <column><name>TYPE_ID</name><value><sequence id="UP_CHAN_TYPE">portlet</sequence></value></column>
<column><name>TYPE_NAME</name><value>Portlet</value></column>
<column><name>TYPE</name><value>org.jasig.portal.channels.portlet.CPortletAdapter</value></column>
<column><name>TYPE_DESCR</name><value>Adapter for JSR-168 Portlets</value></column>
@@ -2917,7 +2917,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_USER_PROFILE</name>
<rows>
<row>
@@ -2927,7 +2927,7 @@
<column><name>DESCRIPTION</name><value>A system profile for common web browsers</value></column>
<column><name>LAYOUT_ID</name><value>1</value></column>
<column><name>STRUCTURE_SS_ID</name><value>3</value></column>
- <column><name>THEME_SS_ID</name><value>3</value></column>
+ <column><name>THEME_SS_ID</name><value><sequence id="UP_SS_THEME">integratedModes</sequence></value></column>
</row>
<row>
@@ -2947,7 +2947,7 @@
<column><name>DESCRIPTION</name><value>A sample profile for web browsers</value></column>
<column><name>LAYOUT_ID</name><value>1</value></column>
<column><name>STRUCTURE_SS_ID</name><value>3</value></column>
- <column><name>THEME_SS_ID</name><value>3</value></column>
+ <column><name>THEME_SS_ID</name><value><sequence id="UP_SS_THEME">integratedModes</sequence></value></column>
</row>
<row>
@@ -2967,7 +2967,7 @@
<column><name>DESCRIPTION</name><value>A sample profile for web browsers</value></column>
<column><name>LAYOUT_ID</name><value>1</value></column>
<column><name>STRUCTURE_SS_ID</name><value>3</value></column>
- <column><name>THEME_SS_ID</name><value>3</value></column>
+ <column><name>THEME_SS_ID</name><value><sequence id="UP_SS_THEME">integratedModes</sequence></value></column>
</row>
<row>
@@ -2987,7 +2987,7 @@
<column><name>DESCRIPTION</name><value>A system profile for common web browsers</value></column>
<column><name>LAYOUT_ID</name><value>1</value></column>
<column><name>STRUCTURE_SS_ID</name><value>3</value></column>
- <column><name>THEME_SS_ID</name><value>3</value></column>
+ <column><name>THEME_SS_ID</name><value><sequence id="UP_SS_THEME">integratedModes</sequence></value></column>
</row>
<row>
@@ -2997,7 +2997,7 @@
<column><name>DESCRIPTION</name><value>A system profile for common web browsers</value></column>
<column><name>LAYOUT_ID</name><value>1</value></column>
<column><name>STRUCTURE_SS_ID</name><value>3</value></column>
- <column><name>THEME_SS_ID</name><value>3</value></column>
+ <column><name>THEME_SS_ID</name><value><sequence id="UP_SS_THEME">integratedModes</sequence></value></column>
</row>
<row>
@@ -3007,7 +3007,7 @@
<column><name>DESCRIPTION</name><value>A system profile for common web browsers</value></column>
<column><name>LAYOUT_ID</name><value>1</value></column>
<column><name>STRUCTURE_SS_ID</name><value>3</value></column>
- <column><name>THEME_SS_ID</name><value>3</value></column>
+ <column><name>THEME_SS_ID</name><value><sequence id="UP_SS_THEME">integratedModes</sequence></value></column>
</row>
<row>
@@ -3017,13 +3017,13 @@
<column><name>DESCRIPTION</name><value>A system profile for common web browsers</value></column>
<column><name>LAYOUT_ID</name><value>1</value></column>
<column><name>STRUCTURE_SS_ID</name><value>3</value></column>
- <column><name>THEME_SS_ID</name><value>3</value></column>
+ <column><name>THEME_SS_ID</name><value><sequence id="UP_SS_THEME">integratedModes</sequence></value></column>
</row>
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_USER_PARM</name>
<rows>
<row>
@@ -3117,7 +3117,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_USER_ATTS</name>
<rows>
<row>
@@ -3525,7 +3525,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_STRUCT</name>
<rows>
<row>
@@ -3542,7 +3542,7 @@
<column><name>SS_DESCRIPTION_URI</name><value>/org/jasig/portal/layout/nested-categories/nested-categories.sdf</value></column>
<column><name>SS_DESCRIPTION_TEXT</name><value>Presents the layout in terms of nested categories.</value></column>
</row>
- <row>
+ <row sinceMajor="2" sinceMinor="2">
<column><name>SS_ID</name><value>3</value></column>
<column><name>SS_NAME</name><value>AL Tabs and columns</value></column>
<column><name>SS_URI</name><value>/org/jasig/portal/layout/AL_TabColumn/AL_TabColumn.xsl</value></column>
@@ -3552,7 +3552,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_THEME</name>
<rows>
<row>
@@ -3584,8 +3584,8 @@
<!-- Cell phone doesn't use tab-column structure stylesheet ! -->
<!-- <column><name>UP_MODULE_CLASS</name><value> (none) </value></column> -->
</row>
- <row>
- <column><name>SS_ID</name><value>3</value></column>
+ <row sinceMajor="2" sinceMinor="2">
+ <column><name>SS_ID</name><value><sequence id="UP_SS_THEME">integratedModes</sequence></value></column>
<column><name>SS_NAME</name><value>Integrated preferences</value></column>
<column><name>SS_URI</name><value>/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes.xsl</value></column>
<column><name>SS_DESCRIPTION_URI</name><value>/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes.sdf</value></column>
@@ -3601,7 +3601,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_THEME_PARM</name>
<rows>
<!-- For nested-tables theme -->
@@ -3621,15 +3621,15 @@
</row>
<!-- For integratedModes theme -->
- <row>
- <column><name>SS_ID</name><value>3</value></column>
+ <row sinceMajor="2" sinceMinor="2">
+ <column><name>SS_ID</name><value><sequence id="UP_SS_THEME">integratedModes</sequence></value></column>
<column><name>PARAM_NAME</name><value>skin</value></column>
<column><name>PARAM_DEFAULT_VAL</name><value>immII</value></column>
<column><name>PARAM_DESCRIPT</name><value>Design skin name</value></column>
<column><name>TYPE</name><value>1</value></column>
</row>
- <row>
- <column><name>SS_ID</name><value>3</value></column>
+ <row sinceMajor="2" sinceMinor="2">
+ <column><name>SS_ID</name><value><sequence id="UP_SS_THEME">integratedModes</sequence></value></column>
<column><name>PARAM_NAME</name><value>minimized</value></column>
<column><name>PARAM_DEFAULT_VAL</name><value>false</value></column>
<column><name>PARAM_DESCRIPT</name><value>Flag determining if the channel is minimized or not</value></column>
@@ -3638,7 +3638,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_STRUCT_PAR</name>
<rows>
<!-- For tab-column structure -->
@@ -3676,7 +3676,7 @@
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_MAP</name>
<rows>
<row>
@@ -3692,7 +3692,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_MIME_TYPE</name>
<rows>
<row>
@@ -3706,7 +3706,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_PERMISSION</name>
<rows>
<row>
@@ -3893,7 +3893,7 @@
<column><name>TARGET</name><value>CHAN_ID.22</value></column>
<column><name>PERMISSION_TYPE</name><value>GRANT</value></column>
</row>
- <row>
+ <row sinceMajor="2" sinceMinor="2">
<column><name>OWNER</name><value>UP_FRAMEWORK</value></column>
<column><name>PRINCIPAL_TYPE</name><value>3</value></column>
<column><name>PRINCIPAL_KEY</name><value>local.0</value></column>
@@ -3901,7 +3901,7 @@
<column><name>TARGET</name><value>CHAN_ID.80</value></column>
<column><name>PERMISSION_TYPE</name><value>GRANT</value></column>
</row>
- <row>
+ <row sinceMajor="2" sinceMinor="2">
<column><name>OWNER</name><value>UP_FRAMEWORK</value></column>
<column><name>PRINCIPAL_TYPE</name><value>3</value></column>
<column><name>PRINCIPAL_KEY</name><value>local.0</value></column>
@@ -3967,7 +3967,7 @@
<column><name>TARGET</name><value>CHAN_ID.99</value></column>
<column><name>PERMISSION_TYPE</name><value>GRANT</value></column>
</row>
- <row>
+ <row sinceMajor="2" sinceMinor="2">
<column><name>OWNER</name><value>UP_FRAMEWORK</value></column>
<column><name>PRINCIPAL_TYPE</name><value>3</value></column>
<column><name>PRINCIPAL_KEY</name><value>local.0</value></column>
@@ -4715,7 +4715,7 @@
</table>
<!-- IBasicEntity types -->
-<table>
+<table sinceMajor="2" sinceMinor="1">
<name>UP_ENTITY_TYPE</name>
<rows>
<row>
@@ -4757,7 +4757,7 @@
</table>
<!-- Groups tables SAMPLE DATA -->
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_GROUP</name>
<rows>
@@ -4867,7 +4867,7 @@
<column><name>GROUP_NAME</name><value>Portal Administrators</value></column>
<column><name>DESCRIPTION</name><value>A group of system administrators with superuser capabilities</value></column>
</row>
- <row>
+ <row sinceMajor="2" sinceMinor="2">
<column><name>GROUP_ID</name><value>15</value></column>
<column><name>CREATOR_ID</name><value>system</value></column>
<column><name>ENTITY_TYPE_ID</name><value>2</value></column>
@@ -4985,7 +4985,7 @@
</rows>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_GROUP_MEMBERSHIP</name>
<rows>
<row>
@@ -5422,7 +5422,7 @@
<!-- END Groups tables SAMPLE DATA -->
<!-- A table that is used by CPermissionsManager -->
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UPC_PERM_MGR</name>
<rows>
<row>
View
106 properties/db/tables.xml
@@ -3,7 +3,7 @@
<tables>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_RESTRICTIONS</name>
<desc>The restrictions</desc>
<columns>
@@ -24,7 +24,7 @@
<primary-key>RESTRICTION_TYPE</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_LAYOUT_RESTRICTIONS</name>
<desc>The layout restrictions</desc>
<columns>
@@ -59,7 +59,7 @@
<primary-key>RESTRICTION_TREE_PATH</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_FRAGMENT_RESTRICTIONS</name>
<desc>The fragment restrictions</desc>
<columns>
@@ -89,7 +89,7 @@
<primary-key>RESTRICTION_TREE_PATH</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_FRAGMENTS</name>
<desc>Layout Fragments</desc>
<columns>
@@ -119,7 +119,7 @@
<column> <name>CHAN_ID</name> <type>INTEGER</type>
<desc>Channel ID if the current Node_ID entry is a channel, then this is set to the channel id subscribed to and located at this position in the layout</desc>
</column>
- <column> <name>NAME</name> <type>VARCHAR</type> <param>35</param>
+ <column> <name>NAME</name> <type>VARCHAR</type> <param>128</param>
<desc>Name of this struct entry, name of tab, column, header or footer, etc</desc>
</column>
<column> <name>GROUP_KEY</name> <type>VARCHAR</type> <param>35</param>
@@ -145,11 +145,11 @@
<primary-key>NODE_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_FRAGMENT_PARAM</name>
<desc>Holds the parameters of fragments</desc>
<columns>
- <column> <name>PARAM_NAME</name> <type>VARCHAR</type> <param>64</param>
+ <column> <name>PARAM_NAME</name> <type>VARCHAR</type> <param>128</param>
<desc>The parameter name</desc>
<key>CK</key>
</column>
@@ -169,7 +169,7 @@
<primary-key>FRAGMENT_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_USER_LAYOUT_AGGR</name>
<desc>For a given user, a layout is created giving it an id and title, basing it on an initial node id</desc>
<columns>
@@ -193,7 +193,7 @@
<primary-key>USER_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_LAYOUT_STRUCT_AGGR</name>
<desc>Holds the order of a user's layout structure - the order in the user layout of channels subscribed to, the order of layout components (columns for example)</desc>
<columns>
@@ -231,7 +231,7 @@
<column> <name>CHAN_ID</name> <type>INTEGER</type>
<desc>Channel ID if the current Struct_ID entry is a channel, then this is set to the channel id subscribed to and located at this position in the layout</desc>
</column>
- <column> <name>NAME</name> <type>VARCHAR</type> <param>35</param>
+ <column> <name>NAME</name> <type>VARCHAR</type> <param>128</param>
<desc>Name of this struct entry, name of tab, column, header or footer, etc</desc>
</column>
<column> <name>GROUP_KEY</name> <type>VARCHAR</type> <param>35</param>
@@ -261,7 +261,7 @@
<primary-key>NODE_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_OWNER_FRAGMENT</name>
<desc>Holds the parameters of fragments</desc>
<columns>
@@ -275,10 +275,10 @@
<column> <name>OWNER_ID</name> <type>INTEGER</type>
<desc>Node ID</desc>
</column>
- <column> <name>FRAGMENT_NAME</name> <type>VARCHAR</type> <param>64</param>
+ <column> <name>FRAGMENT_NAME</name> <type>VARCHAR</type> <param>128</param>
<desc>Fragment name</desc>
</column>
- <column> <name>FRAGMENT_DESCRIPTION</name> <type>VARCHAR</type> <param>128</param>
+ <column> <name>FRAGMENT_DESCRIPTION</name> <type>VARCHAR</type> <param>255</param>
<desc>Fragment description</desc>
</column>
<column> <name>PUSHED_FRAGMENT</name> <type>VARCHAR</type> <param>1</param>
@@ -288,7 +288,7 @@
<primary-key>FRAGMENT_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_GROUP_FRAGMENT</name>
<desc>Holds group assignment for fragments that are being pushed</desc>
<columns>
@@ -305,7 +305,7 @@
<primary-key>GROUP_KEY</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_GROUP_PRIORITY_RANGE</name>
<desc>Holds priority range assignment for user groups</desc>
<columns>
@@ -323,7 +323,7 @@
<primary-key>GROUP_KEY</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="0">
<name>UP_USER</name>
<desc>Entries that uniquely identify a portal session for a particular user</desc>
<columns>
@@ -349,7 +349,7 @@
</columns>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="0">
<name>UP_USER_PARAM</name>
<desc>Not used</desc>
<columns>
@@ -363,7 +363,7 @@
<not-null>USER_ID</not-null>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_USER_LOCALE</name>
<desc>Locale preferences for a user</desc>
<columns>
@@ -383,7 +383,7 @@
<primary-key>LOCALE</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_PERSON_DIR</name>
<desc>Directory information for a given person, including the MD5 password. Emulates a simple external authentication service, like LDAP.</desc>
<columns>
@@ -397,7 +397,7 @@
<column> <name>LST_PSWD_CGH_DT</name> <type>TIMESTAMP</type>
<desc>Date of last password change</desc>
</column>
- <column> <name>FIRST_NAME</name> <type>VARCHAR</type> <param>15</param>
+ <column> <name>FIRST_NAME</name> <type>VARCHAR</type> <param>15</param>
<desc>Person's first name</desc>
</column>
<column> <name>LAST_NAME</name> <type>VARCHAR</type> <param>15</param>
@@ -410,7 +410,7 @@
<primary-key>USER_NAME</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_PERMISSION</name>
<desc>Permission access to framework channels</desc>
<columns>
@@ -441,7 +441,7 @@
</columns>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_USER_LAYOUT</name>
<desc>For a given user, a layout is created giving it an id and title, basing it on an initial structure id - for example a tab column versus a nested structure</desc>
<columns>
@@ -465,7 +465,7 @@
<primary-key>USER_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_LAYOUT_STRUCT</name>
<desc>Holds the order of a user's layout structure - the order in the user layout of channels subscribed to, the order of layout components (columns for example)</desc>
<columns>
@@ -514,7 +514,7 @@
<primary-key>STRUCT_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_LAYOUT_STRUCT_LOCALE</name>
<desc>Locale preferences for a layout struct node</desc>
<columns>
@@ -544,7 +544,7 @@
<primary-key>LOCALE</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_LAYOUT_PARAM</name>
<desc>Parameters set by the user at publish time based upon the Channel Publishing Document of a channel class, see UP_CHAN_TYPE table. Optionally set at subscription time according to the values stored in table up_channel_param</desc>
<columns>
@@ -576,7 +576,7 @@
<not-null>STRUCT_PARM_VAL</not-null>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_CHANNEL</name>
<desc>Channels - this table holds the major elements of a channel used as a default for all users</desc>
<columns>
@@ -629,14 +629,14 @@
<column> <name>CHAN_FNAME</name> <type>VARCHAR</type> <param>255</param>
<desc>Channel functional name. It is used to find a channel in a user's layout via JNDI. It is an optional channel attribute.</desc>
</column>
- <column> <name>CHAN_SECURE</name> <type>VARCHAR</type> <param>1</param>
+ <column sinceMajor="2" sinceMinor="2"> <name>CHAN_SECURE</name> <type>VARCHAR</type> <param>1</param>
<desc>Is the channel secure, meaning is it to be rendered using a secure protocol (i.e. https)? Supported values are 'Y' and 'N'.</desc>
</column>
</columns>
<primary-key>CHAN_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_CHANNEL_PARAM</name>
<desc>Channel parameters - holds channel parameters shared for all users who subscribe to this channel</desc>
<columns>
@@ -661,7 +661,7 @@
<not-null>CHAN_PARM_NM</not-null>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UPC_KEYWORD</name>
<desc>Not used</desc>
<columns>
@@ -686,7 +686,7 @@
<primary-key>USER_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_CHAN_TYPE</name>
<desc>Information about a java channel class, including the class to execute and it's Channel Publishing Document, used at publish</desc>
<columns>
@@ -710,7 +710,7 @@
<primary-key>TYPE_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SEQUENCE</name>
<desc>Emulates auto-increment/sequence values for the the various uPortal tables primary keys. Not used by DBLoader.</desc>
<columns>
@@ -725,7 +725,7 @@
<primary-key>SEQUENCE_NAME</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_USER_UA_MAP</name>
<desc>For a given user and layout combination, a list of reasonable browsers stored in user_agent</desc>
<columns>
@@ -743,7 +743,7 @@
</columns>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_USER_PROFILE</name>
<columns>
<column> <name>USER_ID</name> <type>INTEGER</type>
@@ -771,7 +771,7 @@
<primary-key>PROFILE_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="2">
<name>UP_USER_PROFILE_LOCALE</name>
<desc>Locale preferences for a user profile</desc>
<columns>
@@ -796,7 +796,7 @@
<primary-key>LOCALE</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_USER_PARM</name>
<desc>Holds a user's parameters according to user's structure style sheet - stored in a given user profile (ex. active tab and skin selection) (see up_ss_struct and up_ss_struct_par) based on ss_id</desc>
<columns>
@@ -824,7 +824,7 @@
</columns>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_USER_ATTS</name>
<desc>Holds a user's parameters according to user's theme style sheet - stored in a given user profile (ex. column width) (see up_ss_struct and up_ss_struct_par) based on ss_id</desc>
<columns>
@@ -857,7 +857,7 @@
</columns>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_THEME</name>
<desc>Theme style sheet information - holds device, mime, serializer and class module information to render a given structured style sheet (see up_ss_struct) (ex. Nested tables or Deck of cards) parameters held in up_ss_theme_parm. Initialized when portal registers a NEW theme stylesheet with the database, adding theme stylesheet description</desc>
<columns>
@@ -865,7 +865,7 @@
<desc>Style sheet ID is a unique sequence number used by the portal - primary key, see UP_SEQUENCE</desc>
<key>PK</key>
</column>
- <column> <name>SS_NAME</name> <type>VARCHAR</type> <param>30</param>
+ <column> <name>SS_NAME</name> <type>VARCHAR</type> <param>255</param>
<desc>Theme style sheet name, displayed to the user - (ex. Nested tables or Deck of cards)</desc>
</column>
<column> <name>SS_URI</name> <type>VARCHAR</type> <param>255</param>
@@ -877,7 +877,7 @@
<column> <name>SS_DESCRIPTION_TEXT</name> <type>LONGVARCHAR</type>
<desc>Long description of the results of this rendering for a device</desc>
</column>
- <column> <name>STRUCT_SS_ID</name> <type>INTEGER</type>
+ <column> <name>STRUCT_SS_ID</name> <type>INTEGER</type>
<desc>Foreign key SS_ID of UP_SS_STRUCT - indicates a corresponding structure style sheet for this device</desc>
<key>FK</key>
</column>
@@ -903,7 +903,7 @@
<primary-key>SS_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_THEME_PARM</name>
<desc>Used when portal registers and manages theme stylesheets with parameters</desc>
<columns>
@@ -930,7 +930,7 @@
<primary-key>TYPE</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_STRUCT</name>
<desc>Structure style sheet information - holds information to change the layout components for a user (ex. tabs and columns or nested categories) parameters held in up_ss_struct_par</desc>
<columns>
@@ -938,7 +938,7 @@
<desc>Style sheet ID is a unique sequence number used by the portal - primary key, see UP_SEQUENCE</desc>
<key>PK</key>
</column>
- <column> <name>SS_NAME</name> <type>VARCHAR</type> <param>30</param>
+ <column> <name>SS_NAME</name> <type>VARCHAR</type> <param>255</param>
<desc>Structured style sheet name, displayed to the user - (ex. Tabs and columns, Nested categories)</desc>
</column>
<column> <name>SS_URI</name> <type>VARCHAR</type> <param>255</param>
@@ -954,7 +954,7 @@
<primary-key>SS_ID</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_STRUCT_PAR</name>
<desc>Structure style parameters associated with style sheet entities defined in up_ss_struct table</desc>
<columns>
@@ -980,7 +980,7 @@
<primary-key>TYPE</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_SS_MAP</name>
<desc>Reasonable combinations of themes and structures for a given mime type</desc>
<columns>
@@ -998,7 +998,7 @@
</columns>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_MIME_TYPE</name>
<desc>Mime types known by the portal</desc>
<columns>
@@ -1013,7 +1013,7 @@
<primary-key>MIME_TYPE</primary-key>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_GROUP</name>
<desc>Entries that uniquely identify a uPortal group</desc>
<columns>
@@ -1042,7 +1042,7 @@
<not-null>GROUP_NAME</not-null>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_ENTITY_TYPE</name>
<desc>Holds known IBasicEntity types, associating an Integer code with the name of a class.</desc>
<columns>
@@ -1061,7 +1061,7 @@
<not-null>ENTITY_TYPE_ID</not-null>
</table>
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_GROUP_MEMBERSHIP</name>
<desc>Mapping of member (that is, portal entity or group) to its containing group and flag if it is a group</desc>
<columns>
@@ -1088,7 +1088,7 @@
</table>
<!-- A table that is used by CPermissionsManager, distributed from the JA-SIG Clearinghouse -->
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UPC_PERM_MGR</name>
<desc>A table that is used by CPermissionsManager, distributed from the JA-SIG Clearinghouse</desc>
<columns>
@@ -1100,7 +1100,7 @@
</table>
<!-- Used by the EntityCachingService to synchronize caches on multiple servers. -->
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_ENTITY_CACHE_INVALIDATION</name>
<desc>Each row indicates an entity that has been updated or deleted and whose cache entry is now invalid.</desc>
<columns>
@@ -1115,7 +1115,7 @@
<column> <name>INVALIDATION_TIME</name> <type>TIMESTAMP</type>
<desc>The time the entity was invalidated.</desc>
</column>
- <column> <name>ENTITY_CACHE_ID</name> <type>INTEGER</type>
+ <column sinceMajor="2" sinceMinor="2"> <name>ENTITY_CACHE_ID</name> <type>INTEGER</type>
<desc>The unique ID of the cache instance that wrote this invalidation.</desc>
</column>
</columns>
@@ -1126,7 +1126,7 @@
</table>
<!-- Used by the EntityLockService to share locks among multiple servers. -->
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_ENTITY_LOCK</name>
<desc>Each row represents a lock held on a portal entity on behalf of an owner.</desc>
<columns>
@@ -1157,7 +1157,7 @@
</table>
<!-- Used by the EntityPropertyRegistry to store aribtrary properties. -->
- <table>
+ <table sinceMajor="2" sinceMinor="1">
<name>UP_ENTITY_PROP</name>
<desc>Each row represents a property of a portal entity.</desc>
<columns>
View
10 properties/groups/compositeGroupServices.xml
@@ -17,9 +17,8 @@ This list of component group services is processed by the composite, or "root" s
<caching_enabled>true</caching_enabled>
</service>
-<!-- UNcomment to configure an LDAP group service component. Be sure to edit LDAPGroupStoreConfig.xml with your values. -->
+<!-- Uncomment to configure an LDAP group service component. Be sure to edit LDAPGroupStoreConfig.xml with your values. -->
<!--
-
<service>
<name>ldap</name>
<service_factory>org.jasig.portal.groups.ReferenceIndividualGroupServiceFactory</service_factory>
@@ -31,7 +30,7 @@ This list of component group services is processed by the composite, or "root" s
</service>
-->
-<!-- UNcomment to configure a file system group service component. Change groupsRoot as appropriate. -->
+<!-- Uncomment to configure a file system group service component. Change groupsRoot as appropriate. -->
<!--
<service groupsRoot="C:/groups">
<name>filesystem</name>
@@ -44,10 +43,7 @@ This list of component group services is processed by the composite, or "root" s
</service>
-->
-<!--
- UNcomment to configure a Person Attributes group service component. Configure your person attributes groups
- in PAGSGroupStoreConfig.xml.
--->
+<!-- Uncomment to configure a Person Attributes group service component. Configure your person attributes groups in PAGSGroupStoreConfig.xml. -->
<!--
<service>
<name>pags</name>
View
6 properties/groups/pags.properties
@@ -0,0 +1,6 @@
+# Configuration file for the Person Attributes Group Store
+
+# Specifies the class that will provide the group
+# definitions for the person attributes group store
+#
+org.jasig.portal.groups.pags.PersonAttributesGroupStore.configurationClass=org.jasig.portal.groups.pags.XMLPersonAttributesConfiguration
View
18 properties/portal.properties
@@ -2,14 +2,14 @@
# These properties can be retrieved like this in your java code:
#
-# String propertyValue = PortalProperties.getProperty(propertyName);
-# boolean propertyValue = PortalProperties.getPropertyAsBoolean(propertyName);
-# byte propertyValue = PortalProperties.getPropertyAsByte(propertyName);
-# short propertyValue = PortalProperties.getPropertyAsShort(propertyName);
-# int propertyValue = PortalProperties.getPropertyAsInt(propertyName);
-# long propertyValue = PortalProperties.getPropertyAsLong(propertyName);
-# float propertyValue = PortalProperties.getPropertyAsFloat(propertyName);
-# double propertyValue = PortalProperties.getPropertyAsDouble(propertyName);
+# String propertyValue = PropertiesManager.getProperty(propertyName);
+# boolean propertyValue = PropertiesManager.getPropertyAsBoolean(propertyName);
+# byte propertyValue = PropertiesManager.getPropertyAsByte(propertyName);
+# short propertyValue = PropertiesManager.getPropertyAsShort(propertyName);
+# int propertyValue = PropertiesManager.getPropertyAsInt(propertyName);
+# long propertyValue = PropertiesManager.getPropertyAsLong(propertyName);
+# float propertyValue = PropertiesManager.getPropertyAsFloat(propertyName);
+# double propertyValue = PropertiesManager.getPropertyAsDouble(propertyName);
#
# Please keep the formatting of this properties file as follows:
#
@@ -89,7 +89,7 @@ org.jasig.portal.UserInstance.log_xml_before_theme_transformation=false
# successive calls of the SAX2BufferImpl.characters() method. This behavior
# has been observed in Resin's SAX parser for example.
#
-org.jasig.portal.utils.SAX2BufferImpl.copyCharBlock=no
+org.jasig.portal.utils.SAX2BufferImpl.copyCharBlock=yes
# Channel manager thread pool settings. For meaning of thread pool settings,
View
4 properties/uPortal.xml
@@ -1,2 +1,6 @@
<Context path="/uPortal" docBase="uPortal" crossContext="true">
+
+ <!-- Disables restart persistence of sessions -->
+ <Manager pathname=""/>
+
</Context>
View
119 scripts/createTables-hypersonic.script
@@ -1,119 +0,0 @@
-CREATE TABLE UP_USERS
-(
- ID INTEGER,
- USER_NAME VARCHAR(15) NOT NULL,
- FIRST_NAME VARCHAR(15),
- LAST_NAME VARCHAR(15),
- USER_LAYOUT_XML LONGVARCHAR,
- PRIMARY KEY (ID)
-);
-
-CREATE TABLE UP_SHADOW
-(
- USER_NAME VARCHAR (64),
- PASSWORD VARCHAR (64)
-);
-
-CREATE INDEX PORTAL_SHADOW_PK ON
- UP_SHADOW(USER_NAME);
-
-CREATE TABLE UP_CHANNELS
-(
- CHAN_ID INTEGER NOT NULL,
- TITLE VARCHAR(256) NULL,
- PUB_EMAIL VARCHAR(100) NULL,
- APPROVED INTEGER NULL,
- CHANNEL_XML LONGVARCHAR NOT NULL,
- PRIMARY KEY (CHAN_ID)
-);
-
-CREATE TABLE UP_CHAN_TYPES (
- NAME VARCHAR(70) NOT NULL,
- TYPE VARCHAR(50) NOT NULL,
- DESCR LONGVARCHAR NOT NULL,
- DEF_URI LONGVARCHAR NOT NULL,
- PRIMARY KEY (NAME)
-);
-
-CREATE TABLE UP_CLASS
-(
- CLASS_ID INTEGER NOT NULL,
- NAME VARCHAR(100) NOT NULL,
- PRIMARY KEY (CLASS_ID)
-);
-
-CREATE TABLE UP_CHAN_CLASS
-(
- CLASS_ID INTEGER NOT NULL,
- CHAN_ID INTEGER NOT NULL
-);
-
-CREATE TABLE UP_USER_PREFS
-(
- USER_NAME VARCHAR(15) NOT NULL,
- MEDIA VARCHAR(15) NOT NULL,
- STRUCTURE_STYLESHEET_NAME VARCHAR(30) NOT NULL,
- THEME_STYLESHEET_NAME VARCHAR(30) NOT NULL,
- CSS_STYLESHEET_NAME VARCHAR(30) NOT NULL
-);
-
-CREATE TABLE UP_USER_SS_PREFS
-(
- USER_NAME VARCHAR(15) NOT NULL,
- STYLESHEET_NAME VARCHAR(30) NOT NULL,
- USER_PREFERENCES_XML LONGVARCHAR
-);
-
-CREATE TABLE UP_STRUCT_SS
-(
- STYLESHEET_NAME VARCHAR(30) NOT NULL,
- STYLESHEET_URI LONGVARCHAR NOT NULL,
- STYLESHEET_DESCRIPTION_URI LONGVARCHAR NOT NULL,
- STYLESHEET_DESCRIPTION_TEXT LONGVARCHAR,
- PRIMARY KEY (STYLESHEET_NAME)
-);
-
-CREATE TABLE UP_THEME_SS
-(
- STYLESHEET_NAME VARCHAR(30) NOT NULL,
- STYLESHEET_URI LONGVARCHAR NOT NULL,
- STYLESHEET_DESCRIPTION_URI LONGVARCHAR NOT NULL,
- STYLESHEET_DESCRIPTION_TEXT LONGVARCHAR,
- PRIMARY KEY (STYLESHEET_NAME)
-);
-
-CREATE TABLE UP_CSS_SS
-(
- STYLESHEET_NAME VARCHAR(30) NOT NULL,
- STYLESHEET_URI LONGVARCHAR NOT NULL,
- STYLESHEET_DESCRIPTION_URI LONGVARCHAR NOT NULL,
- STYLESHEET_DESCRIPTION_TEXT LONGVARCHAR,
- PRIMARY KEY (STYLESHEET_NAME)
-);
-
-CREATE TABLE UP_STRUCT_SS_MAP
-(
- MEDIA VARCHAR(15) NOT NULL,
- STRUCTURE_STYLESHEET_NAME VARCHAR(30) NOT NULL
-);
-
-CREATE TABLE UP_THEME_SS_MAP
-(
- THEME_STYLESHEET_NAME VARCHAR(30) NOT NULL,
- STRUCTURE_STYLESHEET_NAME VARCHAR(30) NOT NULL
-);
-
-CREATE TABLE UP_CSS_SS_MAP
-(
- CSS_STYLESHEET_NAME VARCHAR(30) NOT NULL,
- THEME_STYLESHEET_NAME VARCHAR(30) NOT NULL
-);
-
-CREATE TABLE UPC_BOOKMARKS
-(
- ID INTEGER,
- PORTAL_USER_ID INTEGER,
- BOOKMARK_XML LONGVARCHAR,
- PRIMARY KEY (ID)
-);
-
View
15 scripts/dropTables.script
@@ -1,15 +0,0 @@
-DROP TABLE UP_USERS;
-DROP TABLE UP_SHADOW;
-DROP TABLE UP_CHANNELS;
-DROP TABLE UP_CHAN_TYPES;
-DROP TABLE UP_CLASS;
-DROP TABLE UP_CHAN_CLASS;
-DROP TABLE UP_USER_PREFS;
-DROP TABLE UP_USER_SS_PREFS;
-DROP TABLE UP_STRUCT_SS;
-DROP TABLE UP_THEME_SS;
-DROP TABLE UP_CSS_SS;
-DROP TABLE UP_STRUCT_SS_MAP;
-DROP TABLE UP_THEME_SS_MAP;
-DROP TABLE UP_CSS_SS_map;
-DROP TABLE UPC_BOOKMARKS;
View
269 scripts/populateTables.script
@@ -1,269 +0,0 @@
-INSERT INTO UP_USERS (ID, USER_NAME, FIRST_NAME, LAST_NAME) values (0, 'guest', 'Guest', 'Guest');
-
-INSERT INTO UP_USERS (ID, USER_NAME, FIRST_NAME, LAST_NAME) VALUES (1, 'demo', 'Demo', 'User');
-INSERT INTO UP_SHADOW (USER_NAME, PASSWORD) VALUES ('demo', '{MD5}IAnYXaWGdqTkifNNwo0bfIIphj2NPvSG');
-
-UPDATE UP_USERS SET USER_LAYOUT_XML=
-'<?xml version="1.0"?>
-<!DOCTYPE layout SYSTEM "file:/userLayout.dtd">
-<layout>
- <folder ID="t01" priority="1" name="Main">
- <folder ID="col01" priority="0" width="40%" name="Column 1">
- <channel ID="chan00" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="true" removable="true" detachable="false" class="org.jasig.portal.channels.CLogin" name="Login">
- </channel>
- <channel ID="chan01" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="MozillaZine">
- <parameter value="webpages/rss/netscape.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>
- <channel ID="chan02" priority="1" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="StockCharts.com">
- <parameter value="webpages/rss/stockcharts.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>
- </folder>
- <folder ID="col02" priority="0" width="60%" name="Column 2">
- <channel ID="chan03" priority="0" timeout="5000" minimized="false" editable="true" hasHelp="true" removable="true" detachable="true" class="org.jasig.portal.channels.CBookmarks" name="Bookmarks">
- </channel>
- <channel ID="chan04" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="XML.com">
- <parameter value="webpages/rss/news.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>
- </folder>
- </folder>
- <folder ID="t02" priority="0" name="uPortal Tools">
- <channel ID="chan90" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="false" detachable="false" class="org.jasig.portal.channels.CSubscriber" name="Subscribe">
- </channel>
- <channel ID="chan92" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="false" detachable="false" class="org.jasig.portal.channels.CPublisher" name="Publish">
- </channel>
- <channel ID="chan91" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="false" detachable="false" class="org.jasig.portal.channels.CUserPreferences" name="User Preferences">
- </channel>
- </folder>
- <folder ID="t03" priority="0" name="More">
- <folder ID="col03" priority="0" width="50%" name="Column 1">
- <channel ID="chan06" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="uPortal-Powered Sites">
- <parameter value="http://interactivebusiness.com/publish/jasigPortalDemos.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>
- <channel ID="chan07" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="IBS News">
- <parameter value="http://interactivebusiness.com/publish/ibs.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>
- </folder>
- <folder ID="col04" priority="0" width="50%" name="Column 2">
- <channel ID="chan08" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="uPortal Developers Reference">
- <parameter value="http://asigdev.princeton.edu:82/portal/rss/jasigdev.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>
- <channel ID="chan09" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="Salon.com">
- <parameter value="http://www.salon.com/feed/RDF/salon_use.rdf" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>
- </folder>
- </folder>
-</layout>' WHERE USER_NAME='guest';
-
-UPDATE UP_USERS SET USER_LAYOUT_XML=
-'<?xml version="1.0"?>
-<!DOCTYPE layout SYSTEM "file:/userLayout.dtd">
-<layout>
- <folder ID="t01" priority="1" name="Main">
- <folder ID="col01" priority="0" width="40%" name="Column 1">
- <channel ID="chan00" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CNumberGuess" name="Number Guessing Game">
- <parameter value="1" name="minNum"/>
- <parameter value="100" name="maxNum"/>
- </channel>
- <channel ID="chan01" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="MozillaZine">
- <parameter value="webpages/rss/netscape.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>
- <channel ID="chan02" priority="1" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="StockCharts.com">
- <parameter value="webpages/rss/stockcharts.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>
- </folder>
- </folder>
- <folder ID="t02" priority="0" name="uPortal Tools">
- <channel ID="chan90" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="false" detachable="false" class="org.jasig.portal.channels.CSubscriber" name="Subscribe">
- </channel>
- <channel ID="chan91" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="false" detachable="false" class="org.jasig.portal.channels.CUserPreferences" name="User Preferences">
- </channel>
- </folder>
-</layout>' WHERE USER_NAME='demo';
-
-INSERT INTO UP_CHANNELS (CHAN_ID, TITLE, PUB_EMAIL, APPROVED, CHANNEL_XML) VALUES (1, 'Mozillazine', NULL, 0,
-'<channel ID="chan01" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="MozillaZine">
- <parameter value="webpages/rss/netscape.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>')
-
-INSERT INTO UP_CHANNELS (CHAN_ID, TITLE, PUB_EMAIL, APPROVED, CHANNEL_XML) VALUES (2, 'Stockcharts', NULL, 0,
-'<channel ID="chan02" priority="1" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="StockCharts.com">
- <parameter value="webpages/rss/stockcharts.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>')
-
-INSERT INTO UP_CHANNELS (CHAN_ID, TITLE, PUB_EMAIL, APPROVED, CHANNEL_XML) VALUES (3, 'Bookmarks', NULL, 0,
-'<channel ID="chan03" priority="0" timeout="5000" minimized="false" editable="true" hasHelp="true" removable="true" detachable="true" class="org.jasig.portal.channels.CBookmarks" name="Bookmarks">
- </channel>')
-
-INSERT INTO UP_CHANNELS (CHAN_ID, TITLE, PUB_EMAIL, APPROVED, CHANNEL_XML) VALUES (4, 'XML.com', NULL, 0,
-'<channel ID="chan04" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="XML.com">
- <parameter value="webpages/rss/news.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>')
-
-INSERT INTO UP_CHANNELS (CHAN_ID, TITLE, PUB_EMAIL, APPROVED, CHANNEL_XML) VALUES (5, 'uPortal Demos', NULL, 0,
-'<channel ID="chan05" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="uPortal-Powered Sites">
- <parameter value="http://interactivebusiness.com/publish/jasigPortalDemos.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>')
-
-INSERT INTO UP_CHANNELS (CHAN_ID, TITLE, PUB_EMAIL, APPROVED, CHANNEL_XML) VALUES (6, 'IBS News', NULL, 0,
-'<channel ID="chan06" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="IBS News">
- <parameter value="http://interactivebusiness.com/publish/ibs.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>')
-
-INSERT INTO UP_CHANNELS (CHAN_ID, TITLE, PUB_EMAIL, APPROVED, CHANNEL_XML) VALUES (7, 'uPortal Developers Reference', NULL, 0,
-'<channel ID="chan07" priority="0" timeout="5000" minimized="false" editable="false" hasHelp="false" removable="true" detachable="true" class="org.jasig.portal.channels.CGenericXSLT" name="uPortal Developers Reference">
- <parameter value="http://asigdev.princeton.edu:82/portal/rss/jasigdev.rss" name="xml"/>
- <parameter value="webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/RSS.ssl" name="ssl"/>
- </channel>')
-
-INSERT INTO UP_CHAN_TYPES (NAME, TYPE, DESCR, DEF_URI)
-VALUES ('RSS Channel', 'org.jasig.portal.channels.CGenericXSLT',
-'RSS or Rich Site Summary, the most common channel format, is a channel which has its content defined through an XML document. Anyone may publish an RSS channel as long as the specification is adhered to and the file is stored on a publicly accessible web server. You will need to provide a URL for the RSS file.',
-'properties/channel_defs/RSS.xml');
-
-INSERT INTO UP_CHAN_TYPES (NAME, TYPE, DESCR, DEF_URI)
-VALUES ('XSL Channel', 'org.jasig.portal.channels.CGenericXSLT',
-'XSL renders XML to a particular style, is a channel which has its content defined through an XML document. Anyone may publish an XSL channel as long as the specification is adhered to and the file is stored on a publicly accessible web server. You will need to provide a URL or Path for the XML and XSL file.',
-'properties/channel_defs/XSL.xml');
-
-INSERT INTO UP_CLASS ( CLASS_ID, NAME ) VALUES (0, 'News');
-INSERT INTO UP_CLASS ( CLASS_ID, NAME ) VALUES (1, 'Development');
-INSERT INTO UP_CLASS ( CLASS_ID, NAME ) VALUES (2, 'Applications');
-
-INSERT INTO UP_CHAN_CLASS ( CLASS_ID, CHAN_ID ) VALUES(0, 1);
-INSERT INTO UP_CHAN_CLASS ( CLASS_ID, CHAN_ID ) VALUES(0, 2);
-INSERT INTO UP_CHAN_CLASS ( CLASS_ID, CHAN_ID ) VALUES(0, 6);
-INSERT INTO UP_CHAN_CLASS ( CLASS_ID, CHAN_ID ) VALUES(1, 4);
-INSERT INTO UP_CHAN_CLASS ( CLASS_ID, CHAN_ID ) VALUES(1, 5);
-INSERT INTO UP_CHAN_CLASS ( CLASS_ID, CHAN_ID ) VALUES(1, 7);
-INSERT INTO UP_CHAN_CLASS ( CLASS_ID, CHAN_ID ) VALUES(2, 3);
-
-INSERT INTO UP_USER_PREFS (USER_NAME, MEDIA, STRUCTURE_STYLESHEET_NAME, THEME_STYLESHEET_NAME, CSS_STYLESHEET_NAME)
-VALUES ('guest', 'netscape', 'Tab and Column layout', 'Nested tables', 'general CSS');
-
-INSERT INTO UP_USER_PREFS (USER_NAME, MEDIA, STRUCTURE_STYLESHEET_NAME, THEME_STYLESHEET_NAME, CSS_STYLESHEET_NAME)
-VALUES ('guest', 'explorer', 'Tab and Column layout', 'Nested tables', 'general CSS');
-
-INSERT INTO UP_USER_PREFS (USER_NAME, MEDIA, STRUCTURE_STYLESHEET_NAME, THEME_STYLESHEET_NAME, CSS_STYLESHEET_NAME)
-VALUES ('demo', 'netscape', 'Tab and Column layout', 'Nested tables', 'general CSS');
-
-INSERT INTO UP_USER_PREFS (USER_NAME, MEDIA, STRUCTURE_STYLESHEET_NAME, THEME_STYLESHEET_NAME, CSS_STYLESHEET_NAME)
-VALUES ('demo', 'explorer', 'Tab and Column layout', 'Nested tables', 'general CSS');
-
-INSERT INTO UP_USER_SS_PREFS (USER_NAME, STYLESHEET_NAME, USER_PREFERENCES_XML) VALUES ('guest', 'Tab and Column layout', '
-<structurestylesheetuserpreferences>
- <parameters>
- </parameters>
- <folderattributes>
- <attribute name="width">
- <folder folderid="col01" value="70%"/>
- <folder folderid="col02" value="30%"/>
- <folder folderid="col03" value="30%"/>
- <folder folderid="col04" value="70%"/>
- </attribute>
- </folderattributes>
- <channelattributes>
- </channelattributes>
-</structurestylesheetuserpreferences>
-');
-
-INSERT INTO UP_USER_SS_PREFS (USER_NAME, STYLESHEET_NAME, USER_PREFERENCES_XML) VALUES ('guest', 'Nested tables', '
-<themestylesheetuserpreferences>
- <parameters>
- <parameter name="activeTab">2</parameter>
- <parameter name="borderWidth">2</parameter>
- </parameters>
- <folderattributes>
- </folderattributes>
- <channelattributes>
- <attribute name="minimizable">
- <channel channelid="chan01" value="false"/>
- <channel channelid="chan02" value="false"/>
- </attribute>
- </channelattributes>
-</themestylesheetuserpreferences>
-');
-
-INSERT INTO UP_USER_SS_PREFS (USER_NAME, STYLESHEET_NAME, USER_PREFERENCES_XML) VALUES ('demo', 'Tab and Column layout', '
-<structurestylesheetuserpreferences>
- <parameters>
- </parameters>
- <folderattributes>
- <attribute name="width">
- <folder folderid="col01" value="70%"/>
- <folder folderid="col02" value="30%"/>
- <folder folderid="col03" value="30%"/>
- <folder folderid="col04" value="70%"/>
- </attribute>
- </folderattributes>
- <channelattributes>
- </channelattributes>
-</structurestylesheetuserpreferences>
-');
-
-INSERT INTO UP_USER_SS_PREFS (USER_NAME, STYLESHEET_NAME, USER_PREFERENCES_XML) VALUES ('demo', 'Nested tables', '
-<themestylesheetuserpreferences>
- <parameters>
- <parameter name="activeTab">1</parameter>
- <parameter name="borderWidth">1</parameter>
- </parameters>
- <folderattributes>
- </folderattributes>
- <channelattributes>
- <attribute name="minimizable">
- <channel channelid="chan01" value="false"/>
- <channel channelid="chan02" value="false"/>
- </attribute>
- </channelattributes>
-</themestylesheetuserpreferences>
-');
-
-INSERT INTO UP_STRUCT_SS (STYLESHEET_NAME, STYLESHEET_URI, STYLESHEET_DESCRIPTION_URI, STYLESHEET_DESCRIPTION_TEXT)
-VALUES ('Tab and Column layout', 'webpages/stylesheets/org/jasig/portal/LayoutBean/uLayout2sLayout.xsl', 'webpages/stylesheets/org/jasig/portal/LayoutBean/uLayout2sLayout.sdf', 'Presents the layout in terms of tabs and columns.');
-
-INSERT INTO UP_THEME_SS (STYLESHEET_NAME, STYLESHEET_URI, STYLESHEET_DESCRIPTION_URI, STYLESHEET_DESCRIPTION_TEXT)
-VALUES ('Nested tables', 'webpages/stylesheets/org/jasig/portal/LayoutBean/sLayout2html_full.xsl', 'webpages/stylesheets/org/jasig/portal/LayoutBean/sLayout2html_full.sdf', 'Renders tabs and columns as nested tables');
-
-INSERT INTO UP_CSS_SS (STYLESHEET_NAME, STYLESHEET_URI, STYLESHEET_DESCRIPTION_URI, STYLESHEET_DESCRIPTION_TEXT)
-VALUES ('general CSS', 'webpages/media/org/jasig/portal/layout/tabColumn/general.css', 'webpages/media/org/jasig/portal/layout/tabColumn/general.sdf', 'Body, channel tabs and link coloring and fonts');
-
-INSERT INTO UP_CSS_SS_MAP (CSS_STYLESHEET_NAME, THEME_STYLESHEET_NAME) VALUES ('general CSS', 'Nested tables');
-
-INSERT INTO UP_THEME_SS_MAP (THEME_STYLESHEET_NAME, STRUCTURE_STYLESHEET_NAME) VALUES ('Nested tables', 'Tab and Column layout');
-
-INSERT INTO UP_STRUCT_SS_MAP (MEDIA, STRUCTURE_STYLESHEET_NAME) VALUES ('netscape', 'Tab and Column layout');
-
-INSERT INTO UP_STRUCT_SS_MAP (MEDIA, STRUCTURE_STYLESHEET_NAME) VALUES ('explorer', 'Tab and Column layout');
-
-INSERT INTO UPC_BOOKMARKS (ID, PORTAL_USER_ID, BOOKMARK_XML) VALUES (0, 0,
-'<?xml version="1.0"?>
-<bookmarks>
- <bookmark url="http://www.jasig.org" name="JA-SIG" comments="Java in Administration Special Interest Group"/>
- <bookmark url="http://www.interactivebusiness.com" name="IBS" comments="provides uPortal Services"/>
- <bookmark url="http://www.paypal.com" name="PayPal" comments="Send and receive money online!"/>
- <bookmark url="http://google.com" name="Google" comments="great search engine"/>
-</bookmarks>
-');
-
-INSERT INTO UPC_BOOKMARKS (ID, PORTAL_USER_ID, BOOKMARK_XML) VALUES (1, 1,
-'<?xml version="1.0"?>
-<bookmarks>
- <bookmark url="http://www.jasig.org" name="JA-SIG" comments="Java in Administration Special Interest Group"/>
- <bookmark url="http://www.interactivebusiness.com" name="IBS" comments="provides uPortal Services"/>
- <bookmark url="http://www.paypal.com" name="PayPal" comments="Send and receive money online!"/>
- <bookmark url="http://google.com" name="Google" comments="great search engine"/>
-</bookmarks>
-');
View
2  source/.cvsignore
@@ -1,2 +0,0 @@
-properties
-.DS_Store
View
13 source/org/jasig/portal/ChannelDefinition.java
@@ -109,6 +109,7 @@ public ChannelDefinition(int id) {
public boolean isSecure() { return chanIsSecure; }
public ChannelParameter[] getParameters() { return (ChannelParameter[])parameters.values().toArray(new ChannelParameter[0]); }
public String getLocale() { return chanLocale; }
+
// I18n
public String getName(String locale) {
String chanName=(String)chanNames.get(locale);
@@ -118,6 +119,7 @@ public String getName(String locale) {
return chanName;
}
}
+
public String getDescription(String locale) {
/*
return chanDesc;
@@ -129,15 +131,16 @@ public String getDescription(String locale) {
return chanDesc;
}
}
+
public String getTitle(String locale) {
/*
- return chanDesc;
+ return chanTitle;
*/
- String chanDesc=(String)chanDescs.get(locale);
- if (chanDesc == null) {
- return this.chanDesc; // fallback on "en_US"
+ String chanTitle=(String)chanTitles.get(locale);
+ if (chanTitle == null) {
+ return this.chanTitle; // fallback on "en_US"
} else {
- return chanDesc;
+ return chanTitle;
}
}
View
2  source/org/jasig/portal/ChannelManager.java
@@ -900,7 +900,6 @@ public void startRenderingCycle(HttpServletRequest request, HttpServletResponse
this.binfo=new BrowserInfo(request);
this.uPElement=uPElement;
rendererTable.clear();
- processRequestChannelParameters(request);
// check portal JNDI context
if(portalContext==null) {
@@ -918,6 +917,7 @@ public void startRenderingCycle(HttpServletRequest request, HttpServletResponse
LogService.log(LogService.ERROR,"ChannelManager::setReqNRes(): exception raised when trying to obtain channel JNDI context : "+ne);
}
}
+ processRequestChannelParameters(request);
}
/**
View
18 source/org/jasig/portal/ChannelRegistryManager.java
@@ -68,7 +68,7 @@
* that one can subscribe to (add to their layout).
* Also currently manages the channel types data and CPD documents.
* (maybe these should be managed by another class -Ken)
- * @author Ken Weiner, kweiner@interactivebusiness.com
+ * @author Ken Weiner, kweiner@unicon.net
* @version $Revision$
*/
public class ChannelRegistryManager {
@@ -474,18 +474,14 @@ public static void publishChannel (Element channel, String[] categoryIDs, IGroup
channelDef.setApprovalDate(now);
crs.saveChannelDefinition(channelDef);
- // Delete existing category memberships for this channel
- String channelDefEntityKey = String.valueOf(channelDef.getId());
- IEntity channelDefEntity = GroupService.getEntity(channelDefEntityKey, ChannelDefinition.class);
- IEntityGroup topLevelCategory = GroupService.getDistinguishedGroup(GroupService.CHANNEL_CATEGORIES);
- Iterator iter = topLevelCategory.getAllMembers();
+ // Delete existing category memberships for this channel
+ String chanKey = String.valueOf(channelDef.getId());
+ IEntity channelDefEntity = GroupService.getEntity(chanKey, ChannelDefinition.class);
+ Iterator iter = channelDefEntity.getAllContainingGroups();
while (iter.hasNext()) {
- IGroupMember groupMember = (IGroupMember)iter.next();
- if (groupMember.isGroup()) {
- IEntityGroup group = (IEntityGroup)groupMember;
+ IEntityGroup group = (IEntityGroup) iter.next();
group.removeMember(channelDefEntity);
- group.updateMembers();
- }
+ group.update();
}
// For each category ID, add channel to category
View
7 source/org/jasig/portal/ChannelRuntimeData.java
@@ -35,7 +35,6 @@
package org.jasig.portal;
-import java.net.URLEncoder;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Locale;
@@ -273,7 +272,7 @@ public String getBaseActionURL(boolean idempotent) {
// If the base action URL was explicitly set, use it
// peterk: we should probably introduce idepotent version of this one as well, at some point
if (baseActionURL != null) {
- return URLEncoder.encode(baseActionURL);
+ return baseActionURL;
}
String url=null;
@@ -288,7 +287,7 @@ public String getBaseActionURL(boolean idempotent) {
} catch (Exception e) {
LogService.log(LogService.ERROR,"ChannelRuntimeData::getBaseActionURL() : unable to construct a base action URL!");
}
- return URLEncoder.encode(url);
+ return url;
}
/**
@@ -385,7 +384,7 @@ public String getBaseWorkerURL(String worker, boolean idempotent) throws PortalE
url=upfs.getUPFile();
- return URLEncoder.encode(url);
+ return url;
}
/**
View
19 source/org/jasig/portal/DownloadDispatchWorker.java
@@ -35,12 +35,15 @@
package org.jasig.portal;