Permalink
Browse files

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

git-svn-id: https://source.jasig.org/uPortal/tags/rel-2-3-3@8925 f5dbab47-78f9-eb45-b975-e544023573eb
  • Loading branch information...
1 parent 9af8b8c commit 0274f8ed4a1bba7075a078a8f9e5ae1ec0cb31dd infrastructure@lists.ja-sig.org committed Jul 8, 2004
Showing with 4,397 additions and 3,991 deletions.
  1. +2 −56 .cvsignore
  2. +1 −1 build.properties
  3. +28 −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. +1 −1 properties/db/data.xml
  9. +5 −5 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. +7 −11 source/org/jasig/portal/ChannelRegistryManager.java
  20. +16 −3 source/org/jasig/portal/DownloadDispatchWorker.java
  21. +16 −9 source/org/jasig/portal/HttpProxyServlet.java
  22. +10 −1 source/org/jasig/portal/LdapServices.java
  23. +15 −16 source/org/jasig/portal/LogoutServlet.java
  24. +15 −7 source/org/jasig/portal/MediaManager.java
  25. +7 −5 source/org/jasig/portal/PortalSessionManager.java
  26. +3 −5 source/org/jasig/portal/PropertiesManager.java
  27. +7 −6 source/org/jasig/portal/RDBMServices.java
  28. +69 −4 source/org/jasig/portal/RDBMUserIdentityStore.java
  29. +0 −3 source/org/jasig/portal/RDBMUserLayoutStore.java
  30. +3 −1 source/org/jasig/portal/RequestParamWrapper.java
  31. +6 −1 source/org/jasig/portal/StylesheetSet.java
  32. +13 −8 source/org/jasig/portal/StylesheetUserPreferences.java
  33. +17 −16 source/org/jasig/portal/UserInstance.java
  34. +1 −1 source/org/jasig/portal/UserPreferencesManager.java
  35. +14 −2 source/org/jasig/portal/car/CarClassLoader.java
  36. +14 −2 source/org/jasig/portal/car/CarResourceWorker.java
  37. +1 −1 source/org/jasig/portal/car/CarResources.java
  38. +12 −0 source/org/jasig/portal/car/DescriptorHandler.java
  39. +11 −2 source/org/jasig/portal/channels/CGenericXSLT.java
  40. +2 −4 source/org/jasig/portal/channels/CLogin.java
  41. +13 −3 source/org/jasig/portal/channels/UserPreferences/ManageProfilesState.java
  42. +13 −2 source/org/jasig/portal/channels/UserPreferences/TabColumnPrefsState.java
  43. +28 −1 source/org/jasig/portal/channels/portlet/CPortletAdapter.java
  44. +5 −0 source/org/jasig/portal/channels/portlet/ChannelData.java
  45. +30 −14 source/org/jasig/portal/channels/webproxy/CWebProxy.java
  46. +17 −1 source/org/jasig/portal/container/binding/PortletApplicationUnmarshaller.java
  47. +2 −0 source/org/jasig/portal/container/deploy/Deployer.java
  48. +1 −1 source/org/jasig/portal/container/deploy/WebAppDtdResolver.java
  49. +0 −13 source/org/jasig/portal/container/om/common/ObjectIDImpl.java
  50. +2 −1 source/org/jasig/portal/container/om/portlet/ContentTypeImpl.java
  51. +11 −2 source/org/jasig/portal/container/om/portlet/PortletApplicationDefinitionImpl.java
  52. +64 −0 source/org/jasig/portal/container/om/portlet/UserAttributeImpl.java
  53. +68 −0 source/org/jasig/portal/container/om/portlet/UserAttributeListImpl.java
  54. +0 −7 source/org/jasig/portal/container/om/servlet/WebApplicationDefinitionImpl.java
  55. +14 −8 source/org/jasig/portal/container/services/information/InformationProviderServiceImpl.java
  56. +12 −5 source/org/jasig/portal/container/services/information/PortletStateManager.java
  57. +2 −3 source/org/jasig/portal/container/services/information/ResourceURLProviderImpl.java
  58. +34 −1 source/org/jasig/portal/container/services/information/StaticInformationProviderImpl.java
  59. +8 −1 source/org/jasig/portal/groups/ldap/LDAPGroupStore.java
  60. +57 −0 source/org/jasig/portal/groups/pags/IPersonAttributesConfiguration.java
  61. +30 −125 source/org/jasig/portal/groups/pags/PersonAttributesGroupStore.java
  62. +172 −0 source/org/jasig/portal/groups/pags/XMLPersonAttributesConfiguration.java
  63. +1 −1 source/org/jasig/portal/i18n/LocaleAwareXSLT.java
  64. +4 −4 source/org/jasig/portal/i18n/LocaleManager.java
  65. +412 −345 source/org/jasig/portal/layout/AggregatedLayoutManager.java
  66. +56 −32 source/org/jasig/portal/layout/AggregatedUserLayoutStore.java
  67. +1 −1 source/org/jasig/portal/layout/channels/CFragmentManager.java
  68. +14 −2 source/org/jasig/portal/layout/channels/CSkinSelector.java
  69. +2 −13 source/org/jasig/portal/layout/channels/locales/CSessionLocalesSelector.java
  70. +0 −174 source/org/jasig/portal/layout/utils/ALMigrationUtil.java
  71. +33 −24 source/org/jasig/portal/layout/utils/PushFragmentLoader.java
  72. +0 −40 source/org/jasig/portal/layout/utils/README.txt
  73. +0 −20 source/org/jasig/portal/layout/utils/target.xml
  74. +18 −9 source/org/jasig/portal/security/InitialSecurityContextFactory.java
  75. +7 −0 source/org/jasig/portal/security/provider/ChainingSecurityContext.java
  76. +14 −8 source/org/jasig/portal/security/provider/ReferenceAuthorization.java
  77. +10 −19 source/org/jasig/portal/security/provider/RemoteUserPersonManager.java
  78. +9 −2 source/org/jasig/portal/services/AuthorizationService.java
  79. +8 −1 source/org/jasig/portal/services/ExternalServices.java
  80. +57 −34 source/org/jasig/portal/services/PersonDirectory.java
  81. +25 −16 source/org/jasig/portal/services/StatsRecorder.java
  82. +13 −0 source/org/jasig/portal/services/entityproperties/PersonDirPropertyFinder.java
  83. +4 −1 source/org/jasig/portal/tools/ChannelServlet.java
  84. +264 −0 source/org/jasig/portal/tools/DbConvert21.java
  85. +1 −63 source/org/jasig/portal/tools/DeleteUser.java
  86. +1 −1 source/org/jasig/portal/tools/chanpub/ChannelDefDtdResolver.java
  87. +6 −2 source/org/jasig/portal/tools/chanpub/ChannelPublisher.java
  88. +24 −8 source/org/jasig/portal/utils/CommonUtils.java
  89. +0 −14 source/org/jasig/portal/utils/DocumentFactory.java
  90. +38 −16 source/org/jasig/portal/utils/PortalDocumentImpl.java
  91. +32 −11 source/org/jasig/portal/utils/ResourceLoader.java
  92. +19 −7 source/org/jasig/portal/utils/URLUtil.java
  93. +13 −2 source/org/jasig/portal/utils/XSLT.java
  94. +2 −3 source/org/jasig/portal/wsrp/ChannelInstanceManager.java
  95. +3 −6 tests/org/jasig/portal/layout/SimpleUserLayoutManagerTest.java
  96. +10 −1 tests/org/jasig/portal/security/provider/AuthorizationTester.java
  97. +0 −1 webpages/.cvsignore
  98. +2 −2 webpages/media/org/jasig/portal/channels/CGenericXSLT/CGenericXSLT.cpd
  99. +0 −6 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Entries
  100. +0 −1 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Repository
  101. +0 −1 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Root
  102. +1 −1 webpages/stylesheets/org/jasig/portal/channels/CError/html_full_sv_SE.xsl
  103. +1 −1 webpages/stylesheets/org/jasig/portal/channels/CGenericXSLT/footer/footer_webbrowser.xsl
  104. +3 −2 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/AL_TabColumn.xsl
  105. +10 −6 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes.xsl
  106. +2 −0 ...s/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes.xsl.en_US.dict
  107. +1 −1 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes_de_DE.xsl
  108. +2,272 −2,270 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes_en_US.xsl
  109. +28 −28 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes_ja_JP.xsl
  110. +2 −2 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes_lv_LV.xsl
  111. +1 −1 webpages/stylesheets/org/jasig/portal/layout/AL_TabColumn/integratedModes/integratedModes_sv_SE.xsl
  112. +1 −1 webpages/stylesheets/org/jasig/portal/layout/tab-column/nested-tables/nested-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,7 +15,7 @@
#==================== File and Directory Names ========================
app.name=uPortal
-app.version=2.2+
+app.version=2.3.3
lib.path=lib
server.home=C:/JavaClasses/jakarta-tomcat-5.0.18
View
@@ -1253,4 +1253,32 @@
<arg value="${portletApp}"/>
</java>
</target>
+
+ <!-- ==================== DbConvert21 Target ================================= -->
+
+<!--
+
+ The "DbConvert21" target runs uPortal's DbConvert21 program to convert
+ uPortal 2.1 database to 2.2+
+
+ The DbConvert21 tool will add the top level folder to an existing stored layout allowing the
+ layout to be used correctly in the 2.2, 2.3 portal
+
+ ant dbconvert21
+-->
+
+
+ <target name="dbconvert21" depends="compile"
+ description="converts database from 2.1 to 2.2 / 2.3">
+ <echo message="Invoking DbConvert21"/>
+ <java fork="true" dir="${basedir}" classname="org.jasig.portal.tools.DbConvert21">
+ <classpath>
+ <pathelement path="${build.home}/WEB-INF/classes"/>
+ <path refid="compile.classpath"/>
+ </classpath>
+ </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>
View
@@ -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>
View
@@ -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>
@@ -149,7 +149,7 @@
<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>
@@ -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>
@@ -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>
@@ -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>
@@ -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
@@ -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
@@ -1,2 +1,6 @@
<Context path="/uPortal" docBase="uPortal" crossContext="true">
+
+ <!-- Disables restart persistence of sessions -->
+ <Manager pathname=""/>
+
</Context>
Oops, something went wrong.

0 comments on commit 0274f8e

Please sign in to comment.