Permalink
Browse files

This commit was manufactured by cvs2svn to create tag

'rel-2-4-2-rc1'.

git-svn-id: https://source.jasig.org/uPortal/tags/rel-2-4-2-rc1@9818 f5dbab47-78f9-eb45-b975-e544023573eb
  • Loading branch information...
infrastructure@lists.ja-sig.org
infrastructure@lists.ja-sig.org committed Jan 9, 2005
1 parent 880bb63 commit 214f9268c9b229f76e694bd590a3328bd0e525e4
Showing with 3,532 additions and 2,093 deletions.
  1. +30 −0 LICENSE.txt
  2. +140 −0 README.txt
  3. +3 −3 build.properties
  4. +19 −35 build.xml
  5. +7 −0 docs/README
  6. BIN docs/uPortal_architecture_overview.pdf
  7. +137 −0 docs/uPortal_properties_overview.txt
  8. +102 −0 docs/uPortal_tools_overview.txt
  9. +11 −8 docs/website/implementors/services/compositeGroupService.html
  10. +19 −16 docs/website/implementors/services/compositeGroupService_prt.html
  11. BIN lib/{pluto-1.0.1.jar → pluto-1.0.1-rc1.jar}
  12. BIN lib/portlets/proxyportlet.war
  13. BIN lib/portlets/testsuite.war
  14. +3 −0 properties/Logger.properties
  15. +1 −1 properties/PersonDirs.xml
  16. +1 −1 properties/db/data.xml
  17. +4 −4 properties/db/tables.xml
  18. +15 −3 properties/security.properties
  19. +0 −119 scripts/createTables-hypersonic.script
  20. +0 −15 scripts/dropTables.script
  21. +0 −269 scripts/populateTables.script
  22. +1 −1 source/org/jasig/portal/ChannelDefinition.java
  23. +9 −5 source/org/jasig/portal/ChannelFactory.java
  24. +3 −3 source/org/jasig/portal/ChannelManager.java
  25. +1 −4 source/org/jasig/portal/ChannelRenderer.java
  26. +4 −4 source/org/jasig/portal/EntityTypes.java
  27. +86 −5 source/org/jasig/portal/ExceptionHelper.java
  28. +3 −3 source/org/jasig/portal/IChannelRenderer.java
  29. +12 −6 source/org/jasig/portal/LoginServlet.java
  30. +5 −7 source/org/jasig/portal/LogoutServlet.java
  31. +5 −1 source/org/jasig/portal/PortalEvent.java
  32. +8 −3 source/org/jasig/portal/PortalSessionManager.java
  33. +7 −5 source/org/jasig/portal/RDBMChannelRegistryStore.java
  34. +9 −9 source/org/jasig/portal/RDBMServices.java
  35. +242 −175 source/org/jasig/portal/RDBMUserLayoutStore.java
  36. +2 −1 source/org/jasig/portal/ReferenceSequenceGenerator.java
  37. +3 −7 source/org/jasig/portal/RequestParamWrapper.java
  38. +1 −1 source/org/jasig/portal/StylesheetSet.java
  39. +1 −1 source/org/jasig/portal/UserInstance.java
  40. +6 −3 source/org/jasig/portal/UserPreferencesManager.java
  41. +2 −2 source/org/jasig/portal/Version.java
  42. +1 −1 source/org/jasig/portal/channels/CApplet.java
  43. +29 −4 source/org/jasig/portal/channels/CChannelManager.java
  44. +21 −14 source/org/jasig/portal/channels/CError.java
  45. +2 −2 source/org/jasig/portal/channels/CHeader.java
  46. +1 −1 source/org/jasig/portal/channels/CImage.java
  47. +1 −1 source/org/jasig/portal/channels/CInlineFrame.java
  48. +9 −1 source/org/jasig/portal/channels/CSecureInfo.java
  49. +2 −2 source/org/jasig/portal/channels/UserPreferences/CUserPreferences.java
  50. +2 −2 source/org/jasig/portal/channels/UserPreferences/GPreferencesState.java
  51. +2 −2 source/org/jasig/portal/channels/UserPreferences/ManageProfilesState.java
  52. +6 −6 source/org/jasig/portal/channels/iccdemo/CHistory.java
  53. +4 −4 source/org/jasig/portal/channels/iccdemo/CURLSelector.java
  54. +6 −6 source/org/jasig/portal/channels/iccdemo/CViewer.java
  55. +12 −11 source/org/jasig/portal/channels/permissionsmanager/CPermissionsManager.java
  56. +1 −1 source/org/jasig/portal/channels/permissionsmanager/CPermissionsManagerServant.java
  57. +2 −2 source/org/jasig/portal/channels/permissionsmanager/CPermissionsManagerServantFactory.java
  58. +1 −1 source/org/jasig/portal/channels/permissionsmanager/CommandFactory.java
  59. +1 −1 source/org/jasig/portal/channels/permissionsmanager/PermissiblePublishChannels.java
  60. +1 −1 source/org/jasig/portal/channels/permissionsmanager/PermissibleSubscribeChannels.java
  61. +3 −3 source/org/jasig/portal/channels/permissionsmanager/PermissionsXML.java
  62. +3 −3 source/org/jasig/portal/channels/permissionsmanager/RDBMPermissibleRegistry.java
  63. +1 −1 source/org/jasig/portal/channels/permissionsmanager/commands/AssignPermissions.java
  64. +38 −17 source/org/jasig/portal/channels/portlet/CPortletAdapter.java
  65. +3 −0 source/org/jasig/portal/channels/portlet/ChannelData.java
  66. +1 −1 source/org/jasig/portal/channels/webproxy/CWebProxy.java
  67. +1 −2 source/org/jasig/portal/concurrency/caching/LRUCache.java
  68. +4 −4 source/org/jasig/portal/concurrency/caching/RDBMCachedEntityInvalidationStore.java
  69. +7 −3 source/org/jasig/portal/concurrency/locking/MemoryEntityLockStore.java
  70. +4 −4 source/org/jasig/portal/concurrency/locking/RDBMEntityLockStore.java
  71. +42 −14 source/org/jasig/portal/concurrency/locking/ReferenceEntityLockService.java
  72. +24 −6 source/org/jasig/portal/container/binding/PortletApplicationUnmarshaller.java
  73. +1 −1 source/org/jasig/portal/container/binding/WebApplicationMarshaller.java
  74. +5 −2 source/org/jasig/portal/container/om/common/LanguageImpl.java
  75. +49 −19 source/org/jasig/portal/container/om/common/LanguageSetImpl.java
  76. +3 −3 source/org/jasig/portal/container/om/entity/PortletEntityImpl.java
  77. +4 −2 source/org/jasig/portal/container/om/portlet/PortletDefinitionImpl.java
  78. +29 −17 source/org/jasig/portal/container/services/information/PortletStateManager.java
  79. +86 −0 source/org/jasig/portal/container/servlet/DummyParameterRequestWrapper.java
  80. +0 −82 source/org/jasig/portal/container/servlet/EmptyRequestImpl.java
  81. +103 −0 source/org/jasig/portal/container/servlet/PortletParameterRequestWrapper.java
  82. +1 −1 source/org/jasig/portal/groups/EntityGroupNameFinder.java
  83. +46 −0 source/org/jasig/portal/groups/EntityTestingGroupImpl.java
  84. +5 −6 source/org/jasig/portal/groups/RDBMEntityGroupStore.java
  85. +1 −1 source/org/jasig/portal/groups/ReferenceChannelNameFinder.java
  86. +2 −2 source/org/jasig/portal/groups/ReferencePersonNameFinder.java
  87. +4 −7 source/org/jasig/portal/groups/ldap/LDAPGroupStore.java
  88. +2 −3 source/org/jasig/portal/groups/local/searchers/RDBMChannelDefSearcher.java
  89. +2 −3 source/org/jasig/portal/groups/local/searchers/RDBMPersonSearcher.java
  90. +5 −5 source/org/jasig/portal/groups/pags/PersonAttributesGroupStore.java
  91. +1 −1 source/org/jasig/portal/i18n/LocaleManager.java
  92. +1 −2 source/org/jasig/portal/jndi/JNDIManager.java
  93. +2 −2 source/org/jasig/portal/layout/AggregatedLayoutManager.java
  94. +5 −9 source/org/jasig/portal/layout/AggregatedUserLayoutStore.java
  95. +1 −7 source/org/jasig/portal/layout/channels/CContentSubscriber.java
  96. +2 −0 source/org/jasig/portal/layout/channels/CFragmentManager.java
  97. +3 −4 source/org/jasig/portal/ldap/LdapServices.java
  98. +155 −179 source/org/jasig/portal/security/InitialSecurityContextFactory.java
  99. +1 −1 source/org/jasig/portal/security/provider/CacheSecurityContext.java
  100. +10 −5 source/org/jasig/portal/security/provider/ChainingSecurityContext.java
  101. +12 −11 source/org/jasig/portal/security/provider/RDBMPermissionImpl.java
  102. +1 −1 source/org/jasig/portal/security/provider/RemoteUserPersonManager.java
  103. +18 −13 source/org/jasig/portal/security/provider/RestrictedPerson.java
  104. +61 −56 source/org/jasig/portal/security/provider/SimpleLdapSecurityContext.java
  105. +1 −1 source/org/jasig/portal/security/provider/SimplePersonManager.java
  106. +1 −1 source/org/jasig/portal/security/provider/SimpleSecurityContext.java
  107. +1 −1 source/org/jasig/portal/security/provider/TrustSecurityContext.java
  108. +1 −1 source/org/jasig/portal/serialize/HTMLSerializer.java
  109. +50 −19 source/org/jasig/portal/services/Authentication.java
  110. +4 −5 source/org/jasig/portal/services/AuthorizationService.java
  111. +7 −8 source/org/jasig/portal/services/EntityPropertyRegistry.java
  112. +17 −17 source/org/jasig/portal/services/ExternalServices.java
  113. +3 −1 source/org/jasig/portal/services/GroupService.java
  114. +13 −8 source/org/jasig/portal/services/LogService.java
  115. +171 −116 source/org/jasig/portal/services/PersonDirectory.java
  116. +3 −2 source/org/jasig/portal/services/SequenceGenerator.java
  117. +1 −1 source/org/jasig/portal/services/StatsRecorder.java
  118. +2 −4 source/org/jasig/portal/services/entityproperties/ChannelRegistryPropertyFinder.java
  119. +2 −1 source/org/jasig/portal/services/entityproperties/ContainingGroupsFinder.java
  120. +1 −1 source/org/jasig/portal/services/entityproperties/PersonDirPropertyFinder.java
  121. +4 −8 source/org/jasig/portal/services/entityproperties/RDBMPropertyStore.java
  122. +1 −1 source/org/jasig/portal/services/stats/StatsRecorderSettings.java
  123. +38 −48 source/org/jasig/portal/tools/dbloader/Configuration.java
  124. +50 −53 source/org/jasig/portal/tools/dbloader/DbLoader.java
  125. +22 −47 source/org/jasig/portal/tools/dbloader/DbUtils.java
  126. +4 −4 source/org/jasig/portal/utils/DocumentFactory.java
  127. +27 −11 source/org/jasig/portal/utils/RDBMCounterStore.java
  128. +4 −4 source/org/jasig/portal/utils/SqlTransaction.java
  129. +1 −1 source/org/jasig/portal/utils/URLUtil.java
  130. +171 −0 source/org/jasig/portal/utils/WeakValueMap.java
  131. +2 −2 source/org/jasig/portal/wsrp/bind/WSRP_v1_ServiceDescription_Binding_SOAPImpl.java
  132. +217 −0 tests/org/jasig/portal/ExceptionHelperTest.java
  133. +42 −0 tests/org/jasig/portal/channels/CSecureInfoTest.java
  134. +74 −0 tests/org/jasig/portal/channels/EventRecordingChannel.java
  135. +3 −3 tests/org/jasig/portal/concurrency/locking/EntityLockTester.java
  136. +72 −4 tests/org/jasig/portal/groups/GroupsTester.java
  137. +33 −19 tests/org/jasig/portal/lang/ChainedThrowable_Test.java
  138. +33 −33 tests/org/jasig/portal/lang/Resources_Test.java
  139. +33 −19 tests/org/jasig/portal/lang/StackTrace_Test.java
  140. +33 −19 tests/org/jasig/portal/lang/ThrowableHelper_Test.java
  141. +33 −19 tests/org/jasig/portal/lang/TypeConverter_Test.java
  142. +234 −0 tests/org/jasig/portal/security/provider/RestrictedPersonTest.java
  143. +5 −5 webpages/media/org/jasig/portal/channels/portlet/wsrp-consumer.cpd
  144. +0 −6 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Entries
  145. +0 −1 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Repository
  146. +0 −1 webpages/media/org/jasig/portal/layout/AL_TabColumn/integratedModes/cartoon/CVS/Root
  147. +10 −2 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html.xsl
  148. +10 −2 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_en_US.xsl
  149. +10 −2 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_it_IT.xsl
  150. +310 −302 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_ja_JP.xsl
  151. +10 −2 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_lv_LV.xsl
  152. +10 −2 webpages/stylesheets/org/jasig/portal/channels/CChannelManager/html_sv_SE.xsl
View
@@ -0,0 +1,30 @@
+Copyright 2000-2004 The JA-SIG Collaborative. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+3. Redistributions of any form whatsoever must retain the following
+ acknowledgment:
+ "This product includes software developed by the JA-SIG Collaborative
+ (http://www.jasig.org/)."
+
+THIS SOFTWARE IS PROVIDED BY THE JA-SIG COLLABORATIVE "AS IS" AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JA-SIG COLLABORATIVE OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
View
@@ -0,0 +1,140 @@
+$Id$
+
+uPortal 2.4.2 Distribution
+--------------------------
+
+Purpose
+-------
+This distribution is targeted towards
+people who would like to install
+uPortal in a development or production
+environment. It contains uPortal source
+code and properties files, but not a servlet
+container, directory, or relational database,
+which are required. Use of this distribution
+requires knowledge of J2EE environments and the
+Ant tool from the Apache Jakarta project.
+
+
+Contents
+--------
+1) uPortal
+2) uPortal dependencies (Xalan, Pluto, etc).
+3) uPortal Architecture overview and JavaDoc API
+
+
+System requirements
+-------------------
+JDK 1.4 or higher
+JAVA_HOME environment variable must be set
+Installation of Ant from Jakarta:
+ http://ant.apache.org/
+
+
+Instructions
+------------
+Modify build.properties with local settings.
+
+Use the following ant targets:
+
+initportal - installs uPortal into a servlet container,
+ prepares a relational database with uPortal schema and data,
+ publishes channels and layout fragments,
+ deploys portlet applications
+dist - creates JavaDoc, uPortal jar, and uPortal WAR files.
+
+For descriptions of other Ant targets,
+see docs/uPortal_tools_overview.txt.
+
+Make sure the database and servlet container are running and
+access uPortal with http://localhost:8080/uPortal/
+Your URL may be different if you have configured a different port
+and/or context name.
+
+You can login to uPortal with the following user name/password
+combinations:
+
+demo, demo
+student, student
+faculty, faculty
+staff, staff
+developer, developer
+
+Each user may have a slightly different layout.
+
+
+Notes
+-----
+-Several properties files and one database table changed
+ since uPortal 2.3.x. If you are upgrading from this version,
+ you will need to see to it that your properties files and
+ database data are upgraded appropriately. The difficulty
+ of upgrading from 2.3.x to 2.4.x is expected to be much lower
+ than similar upgrades in past versions.
+
+-uPortal does not strictly require the use of connection
+ pooling, but it is highly recommended for production
+ installations. If your servlet container does not provide
+ connection pooling, try something like Yet Another Poolman.
+ For information about Yet Another Poolman,
+ see http://yapoolman.sourceforge.net/.
+
+-Bug fixes from 2.3.x releases have been implemented in 2.4.x
+ whenever they were appropriate
+
+-If you experience XML/XSLT-related errors, there is a good
+ chance that your environment is not using the version of
+ Xalan/Xerces that comes with this release. If you are using
+ Tomcat, try copying the following files into Tomcat's
+ common/endorsed directory: xalan.jar, xercesImpl.jar, xml-apis.jar.
+ Alternatively, you can specify the use of these jar files
+ via a java parameter when starting your servlet container:
+ -Xbootclasspath/p:xalan.jar;xercesImpl.jar;xml-apis.jar
+ For more information, see Version section of
+ http://xml.apache.org/xalan-j/faq.html
+
+-JSR 168 Portlets are supported in this version of uPortal.
+ For information on installing Portlets, see
+ http://www.uportal.org/implementors/portlets/workingWithPortlets.html.
+
+-WSRP functionality was included in uPortal as early as uPortal 2.2.
+ However, beginning with uPortal 2.4, the WSRP consumer has been replaced with
+ one based on WSRP4J. The WSRP producer has been deprecated but may
+ be reintroduced in a future release.
+
+Please report bugs and suggestions:
+
+ http://www.uportal.org/bugzilla/
+
+uPortal website:
+
+ http://www.uportal.org
+
+
+Release Notes - uPortal - Version 2.4.2
+---------------------------------------
+** Bug
+ * [UP-338] - RENDERING_DONE Event never sent
+ * [UP-476] - User's LDAP groups not loaded if username contains uppercase
+ * [UP-744] - PersonDirectory has a memory leak related to caching IPersons in a WeakHashMap
+ * [UP-745] - ChannelManager has a memory leak, when it swaps out a channel for the CError channel, the end session events never progagate to the original channel
+ * [UP-746] - CSecureInfo has a memory leak, when ChannelManager swaps out a channel for the CSecureInfo channel, the to end session events never propagate to the original channel
+ * [UP-747] - Change to portlet parameter encoding breaks download worker URLs
+ * [UP-748] - Infinite recursion in RestrictedPerson
+ * [UP-749] - render parameter does not survive refresh
+ * [UP-753] - ChannelFactory should not expose internal map of static channels, not create more than one instance of a multithreaded channel
+ * [UP-759] - Xalan jar should be deployed to endorsed directory
+ * [UP-760] - Entity locks not expired correctly
+ * [UP-761] - A lock owner is limited to single READ lock on an entity
+ * [UP-772] - Classpath resources not being copied to build
+ * [UP-775] - Duplicate read locks for a single owner not permitted.
+ * [UP-776] - WebApplicationMarshaller.java turns resource-ref into resource-env-ref
+ * [UP-778] - AggregatedLayoutManager.loadUserLayout() fails to log stack trace for exception
+ * [UP-779] - ChannelRenderer declares constants that are already declared in its base class
+ * [UP-780] - Eliminate "unknown additional descriptor warning" when using ChainingSecurityContext
+ * [UP-796] - contains() doesn't always work for PAGS groups
+ * [UP-798] - GroupService.isComposite always returns null
+
+
+** Improvement
+ * [UP-770] - Document hsqldb version included with uPortal
View
@@ -15,10 +15,10 @@
#==================== File and Directory Names ========================
app.name=uPortal
-app.version=2.4
+app.version=2.4.1+
lib.path=lib
-server.home=/JavaClasses/jakarta-tomcat-5.0.25
+server.home=/JavaClasses/jakarta-tomcat-5.0.28
deploy.home=${server.home}/webapps/uPortal
@@ -49,7 +49,7 @@ wsdl4j.jar=${lib.path}/wsdl4j.jar
commons-discovery.jar=${lib.path}/commons-discovery.jar
commons-logging.jar=${lib.path}/commons-logging.jar
portlet-api.jar=${lib.path}/portlet-api-1.0.jar
-pluto.jar=${lib.path}/pluto-1.0.1.jar
+pluto.jar=${lib.path}/pluto-1.0.1-rc1.jar
wsrp4j-shared.jar=${lib.path}/wsrp4j-shared-0.3.jar
wsrp4j-consumer.jar=${lib.path}/wsrp4j-consumer-0.3.jar
proxyportlet.jar=${lib.path}/proxyportlet.jar
View
@@ -237,20 +237,20 @@
URL: http://jakarta.apache.org/commons/logging.html
portlet-api.jar Portlet API based on JSR-168.
- Version: (from jakarta-pluto CVS on September 22, 2004)
+ Version: (from jakarta-pluto CVS on November 2, 2004)
URL: http://www.jcp.org/en/jsr/detail?id=168
pluto.jar Reference Implementation of the Java Portlet Specfication.
This Portlet container provides a runtime environment for
portlets implemented according to the Portlet API.
The project is still in the Apache Incubator.
- Version: (from jakarta-pluto CVS on September 22, 2004)
+ Version: (from jakarta-pluto CVS on November 2, 2004)
URL: http://portals.apache.org/pluto/
wsrp4j-shared.jar WSRP4J shared classes mostly derived from OASIS WSRP WSDL.
Comes with WSRP4J.
Use the version that comes with WSRP4J.
- Version: (from ws-wsrp4j CVS on July 9, 2004)
+ Version: (from ws-wsrp4j CVS on November 2, 2004)
URL: http://ws.apache.org/wsrp4j/
wsrp4j-consumer.jar WSRP4J consumer classes.
@@ -264,20 +264,6 @@
The following modifications were made to the
WSRP4J proxy portlet source:
-
- - org.apache.wsrp4j.consumer.portlet.impl.ProxyPortlet:
-
- IS: protected PortletKey getPortletKey(Map preferences)
- WAS: private PortletKey getPortletKey(Map preferences)
-
- IS: protected Producer getProducer(String producerID) throws WSRPException
- WAS: private Producer getProducer(String producerID) throws WSRPException
-
- Added new method
- protected ConsumerEnvironment getConsumerEnvironment()
- {
- return consumerEnv;
- }
- portlet.xml
@@ -286,7 +272,7 @@
IS: <value>org.jasig.portal.wsrp.consumer.portlet.ConsumerEnvironmentImpl</value>
WAS: <value>org.apache.wsrp4j.consumer.portlet.impl.ConsumerEnvironmentImpl</value>
-
+
- wsrp4j-logger.properties
IS: log4j.appender.A1.File=wsrp4j-consumer.log
@@ -469,6 +455,11 @@
<classpath refid="compile.classpath"/>
</javac>
+ <!-- Copy non-java resources -->
+ <copy todir="${build.home}/WEB-INF/classes">
+ <fileset dir="source" excludes="CVS,**/*.java"/>
+ </copy>
+
<!-- Copy associated resource files -->
<copy todir="${build.home}/WEB-INF/classes/properties">
<fileset dir="properties" includes="**/*"/>
@@ -477,11 +468,6 @@
<!-- Copy the Logger.properties file to the well-known location
log4j expects.-->
<copy file="properties/Logger.properties" tofile="${build.home}/WEB-INF/classes/log4j.properties"/>
-
- <!-- Copy serializer resources -->
- <copy todir="${build.home}/WEB-INF/classes/org/jasig/portal/serialize">
- <fileset dir="source/org/jasig/portal/serialize" includes="**/*.res"/>
- </copy>
<!-- Copy all stylesheets, stylesheet descriptions and stylesheet list files -->
<copy todir="${build.home}/WEB-INF/classes">
@@ -528,7 +514,6 @@
<!-- Copy external dependencies as required -->
<mkdir dir="${deploy.home}/WEB-INF/lib"/>
- <copy todir="${deploy.home}/WEB-INF/lib" file="${xalan.jar}"/>
<copy todir="${deploy.home}/WEB-INF/lib" file="${xercesImpl.jar}"/>
<copy todir="${deploy.home}/WEB-INF/lib" file="${xml-apis.jar}"/>
<copy todir="${deploy.home}/WEB-INF/lib" file="${tidy.jar}"/>
@@ -547,11 +532,12 @@
<copy todir="${deploy.home}/WEB-INF/lib" file="${jdbc2_0-stdext.jar}"/>
<copy todir="${deploy.home}/WEB-INF/lib" file="${jdbcDriver.jar}"/>
- <!-- This is Tomcat-specific! We need to think about a new property
+ <!-- There are Tomcat-specific! We need to think about a new property
that lets us specify the appropriate directory for other servers
-->
<copy todir="${server.home}/shared/lib" file="${portlet-api.jar}"/>
<copy todir="${server.home}/shared/lib" file="${pluto.jar}"/>
+ <copy todir="${server.home}/common/endorsed" file="${xalan.jar}"/>
<!-- This is Tomcat-specific and server name-specific!
We need to find out the best way to ensure cross-context
@@ -619,8 +605,7 @@
-->
- <target name="javadoc" depends="compile"
- description="Create Javadoc API documentation">
+ <target name="javadoc" description="Create Javadoc API documentation">
<mkdir dir="${dist.home}/docs/api"/>
<javadoc sourcepath="source"
@@ -908,7 +893,7 @@
The variable fragmentFile points to the XML file of the fragments definition
- ant fragment -DfragmentFile=/properties/al/fragments.xml
+ ant pubfragments -DfragmentFile=/properties/al/fragments.xml
-->
@@ -1280,24 +1265,23 @@
-->
-
+
<target name="pubchan" description="Publishes channels" depends="compile">
<echo message="Invoking Channel Publisher Tool"/>
-
+
<property name="channel" value=" "/>
<java fork="true" dir="${basedir}" classname="org.jasig.portal.tools.chanpub.ChannelPublisher">
- <classpath refid="compile.classpath"/>
<classpath>
- <pathelement path="${build.home}/WEB-INF/classes"/>
+ <pathelement path="${build.home}/WEB-INF/classes"/>
+ <path refid="compile.classpath"/>
</classpath>
<arg value="-n"/>
<arg value="${channel}"/>
</java>
</target>
-
-<!-- ===================== deployPortlet Target ========================= -->
+<!-- ===================== deployPortletApp Target ========================= -->
<!--
@@ -1318,9 +1302,9 @@
<property name="portletApp" value=" "/>
<java fork="true" dir="${basedir}" classname="org.jasig.portal.container.deploy.Deployer">
- <classpath refid="compile.classpath"/>
<classpath>
<pathelement path="${build.home}/WEB-INF/classes"/>
+ <path refid="compile.classpath"/>
</classpath>
<arg value="${deploy.home}/.."/>
<arg value="${portletApp}"/>
View
@@ -53,6 +53,13 @@ The following ant command will deploy the documentation:
ant deploy
+About HSQLDB
+------------
+
+Using an older version of hsqldb.jar with another version of the HSQLDB server could cause uPortal to hang.
+See hsqldb.jar's entry in build.xml for documentation of exactly what version of hsqldb.jar is included with this release.
+
+
Copyright
---------
Binary file not shown.
Oops, something went wrong.

0 comments on commit 214f926

Please sign in to comment.