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

git-svn-id: https://source.jasig.org/uPortal/tags/rel-2-4-1@9546 f5dbab47-78f9-eb45-b975-e544023573eb

build.properties

@@ -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

build.xml

@@ -237,20 +237,20 @@
                        URL: http://jakarta.apache.org/commons/logging.html
                        
   portlet-api.jar      Portlet API based on JSR-168.
-                       Version: (from jakarta-pluto CVS on September 22, 2004)
+                       Version: (from jakarta-pluto CVS on November 2, 2004)
                        URL: http://www.jcp.org/en/jsr/detail?id=168
   
   pluto.jar            Reference Implementation of the Java Portlet Specfication.
                        This Portlet container provides a runtime environment for 
                        portlets implemented according to the Portlet API.
                        The project is still in the Apache Incubator.
-                       Version: (from jakarta-pluto CVS on September 22, 2004)
+                       Version: (from jakarta-pluto CVS on November 2, 2004)
                        URL: http://portals.apache.org/pluto/
 
   wsrp4j-shared.jar    WSRP4J shared classes mostly derived from OASIS WSRP WSDL.
                        Comes with WSRP4J.
                        Use the version that comes with WSRP4J.
-                       Version: (from ws-wsrp4j CVS on July 9, 2004)
+                       Version: (from ws-wsrp4j CVS on November 2, 2004)
                        URL: http://ws.apache.org/wsrp4j/
 
   wsrp4j-consumer.jar  WSRP4J consumer classes.
@@ -264,20 +264,6 @@
                        
                        The following modifications were made to the
                        WSRP4J proxy portlet source:
-                       
-                       - org.apache.wsrp4j.consumer.portlet.impl.ProxyPortlet:
-                       
-                          IS: protected PortletKey getPortletKey(Map preferences)
-                         WAS: private PortletKey getPortletKey(Map preferences)
-                           
-                          IS: protected Producer getProducer(String producerID) throws WSRPException
-                         WAS: private Producer getProducer(String producerID) throws WSRPException
-                       
-                         Added new method
-                             protected ConsumerEnvironment getConsumerEnvironment() 
-                             {
-                                 return consumerEnv;
-                             }
                              
                        - portlet.xml
                        
@@ -286,7 +272,7 @@
 
                           IS: <value>org.jasig.portal.wsrp.consumer.portlet.ConsumerEnvironmentImpl</value>
                          WAS: <value>org.apache.wsrp4j.consumer.portlet.impl.ConsumerEnvironmentImpl</value>
-                                                       
+        
                        - wsrp4j-logger.properties
                        
                           IS: log4j.appender.A1.File=wsrp4j-consumer.log
@@ -908,7 +894,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 +1266,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 +1303,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}"/>

docs/website/implementors/services/compositeGroupService.html

@@ -298,21 +298,24 @@ <h4><a name="Groups_Keys_and_Service_Names"></a>Groups, Keys and
 is fully assembled.&nbsp; In the reference implementation, the service
 name is built up node by node as the composite is composed.&nbsp; <br>
       </p>
-      <p><span style="font-style: italic;">Group Keys.</span>&nbsp; A
+     <p><span style="font-style: italic;">Group Keys.</span>&nbsp; A
 group's composite service key is the concatenation of its
 fully-qualified service name and its key in the local service.&nbsp; The
 nodes of the service name, and the final node of the name and the local
 key, are separated by a <span style="font-style: italic;">node separator</span>.&nbsp;
 For example, a group with a local key of "English_Department" in a
-service named "ldap" with a node separator of "%" would have a key of
-"ldap%English_Department".&nbsp; <br>
+service named "ldap" with a node separator of "!" would have a key of
+"ldap!English_Department".&nbsp; <br>
       </p>
       <p><span style="font-style: italic;">Node Separators.</span>&nbsp;
-The default node separator is the period, or ".", but it can be any <code>String</code>
-not found within the nodes of a group key.&nbsp; For example, if local
-group keys include "Latin.101.Section01" and "chefs@columbia.edu", valid
-separators would include "$", "%", and "@@", but not "." or "@".&nbsp;
-For instructions on changing the node separator see <a
+The default node separator is a String containing a period, or ".", but 
+it can be any String not found within the nodes of a group key.&nbsp; 
+However, group keys can find their way into portal content and urls
+and are subject to xsl transformations.  Therefore, the separator should not 
+contain a character like '%' that has a special meaning and must be escaped
+to preserve its literal value.  If local group keys include "Latin.101.Section01" 
+and "chefs@columbia.edu", valid separators would include "$", and "_x", but not 
+"." or "@".&nbsp; For instructions on changing the node separator see <a
  href="#Configuring_the_Composite">Configuring the Composite</a>.&nbsp; <br>
       </p>
       <p><span style="font-style: italic;">Groups and their Service

docs/website/implementors/services/compositeGroupService_prt.html

@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <html>
 <head>
   <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
@@ -259,23 +259,26 @@ <h4><a name="Groups_Keys_and_Service_Names"></a>Groups, Keys and
 reference implementation, the service name is built up node by node as
 the composite is composed.&nbsp; <br>
 </p>
-<p><span style="font-style: italic;">Group Keys.</span>&nbsp; A group's
-composite service key is the concatenation of its fully-qualified
-service name and its key in the local service.&nbsp; The nodes of the
-service name, and the final node of the name and the local key, are
-separated by a <span style="font-style: italic;">node separator</span>.&nbsp;
+     <p><span style="font-style: italic;">Group Keys.</span>&nbsp; A
+group's composite service key is the concatenation of its
+fully-qualified service name and its key in the local service.&nbsp; The
+nodes of the service name, and the final node of the name and the local
+key, are separated by a <span style="font-style: italic;">node separator</span>.&nbsp;
 For example, a group with a local key of "English_Department" in a
-service named "ldap" with a node separator of "%" would have a key of
-"ldap%English_Department".&nbsp; <br>
-</p>
-<p><span style="font-style: italic;">Node Separators.</span>&nbsp; The
-default node separator is the period, or ".", but it can be any <code>String</code>
-not found within the nodes of a group key.&nbsp; For example, if local
-group keys include "Latin.101.Section01" and "chefs@columbia.edu", valid
-separators would include "$", "%", and "@@", but not "." or "@".&nbsp;
-For instructions on changing the node separator see <a
+service named "ldap" with a node separator of "!" would have a key of
+"ldap!English_Department".&nbsp; <br>
+      </p>
+      <p><span style="font-style: italic;">Node Separators.</span>&nbsp;
+The default node separator is a String containing a period, or ".", but 
+it can be any String not found within the nodes of a group key.&nbsp; 
+However, group keys can find their way into portal content and urls
+and are subject to xsl transformations.  Therefore, the separator should not 
+contain a character like '%' that has a special meaning and must be escaped
+to preserve its literal value.  If local group keys include "Latin.101.Section01" 
+and "chefs@columbia.edu", valid separators would include "$", and "_x", but not 
+"." or "@".&nbsp; For instructions on changing the node separator see <a
  href="#Configuring_the_Composite">Configuring the Composite</a>.&nbsp; <br>
-</p>
+      </p>
 <p><span style="font-style: italic;">Groups and their Service Names.</span>&nbsp;
 The significance of the service name in a group key is that    it
 directs us to the specific service that can answer the request for the

properties/PersonDirs.xml

@@ -211,6 +211,7 @@
         <url>ldap://yu.yale.edu:389/dc=itstp, dc=yale, dc=edu</url>
         <logonid>cn=bogus,cn=Users,dc=itstp,dc=yale,dc=edu</logonid>
         <logonpassword>foobar</logonpassword>
+        <usercontext>cn=Users</usercontext>
 
         2) Specify the name of an LDAP server as set up in uPortal's ldap.xml.  For example,
         
@@ -223,7 +224,6 @@
         <ldap-ref-name>Main</ldap-ref-name>
 
         <uidquery>(cn={0})</uidquery>
-        <usercontext>cn=Users</usercontext>
 
         <attributes>
 

properties/db/data.xml

@@ -10,7 +10,7 @@
         <column><name>FNAME</name><value>UP_FRAMEWORK</value></column>
         <column><name>MAJOR</name><value>2</value></column>
         <column><name>MINOR</name><value>4</value></column>
-        <column><name>MICRO</name><value>0</value></column>
+        <column><name>MICRO</name><value>1</value></column>
         <column><name>DESCRIPTION</name><value>The uPortal Framework.</value></column>
       </row>
     </rows>

properties/db/tables.xml

@@ -60,12 +60,12 @@
       <column>
         <name>PREF_ID</name>
         <type>INTEGER</type>
-        <desc>Preference key forieg key for UP_PORTLET_PREF_VALUES</desc>
+        <desc>Preference key foreign key for UP_PORTLET_PREF_VALUES</desc>
       </column>      
     </columns>
     <primary-key>CHAN_ID</primary-key>
     <primary-key>PREF_ID</primary-key>
-    <not-null>PORTLET_PREFERENCES_NAME</not-null>
+    <not-null>PORTLET_PREF_NAME</not-null>
   </table>
 
   <table sinceMajor="2" sinceMinor="4">
@@ -103,7 +103,7 @@
     <primary-key>LAYOUT_ID</primary-key>
     <primary-key>CHAN_DESC_ID</primary-key>
     <primary-key>PREF_ID</primary-key>
-    <not-null>PORTLET_PREFERENCES_NAME</not-null>
+    <not-null>PORTLET_PREF_NAME</not-null>
   </table>  
 
   <table sinceMajor="2" sinceMinor="4">

properties/security.properties

@@ -40,6 +40,15 @@
 
 # This is the factory that supplies the concrete authentication class
 root=org.jasig.portal.security.provider.SimpleSecurityContextFactory
+
+# Sample security context chain that caches the authenticated user's password
+#root=org.jasig.portal.security.provider.UnionSecurityContextFactory
+#root.db=org.jasig.portal.security.provider.SimpleSecurityContextFactory
+#root.db.cache=org.jasig.portal.security.provider.CacheSecurityContextFactory
+#root.ldap=org.jasig.portal.security.provider.SimpleLdapSecurityContextFactory
+#root.ldap.cache=org.jasig.portal.security.provider.CacheSecurityContextFactory
+
+#root.ldap=org.jasig.portal.security.provider.CacheLdapSecurityContextFactory
 #root.cas=edu.columbia.ais.portal.security.provider.CasSecurityContextFactory
 
 #Configurable security context example
@@ -49,9 +58,12 @@ root=org.jasig.portal.security.provider.SimpleSecurityContextFactory
 #root.ldap_stu=org.jasig.portal.security.provider.SimpleLdapSecurityContextFactory
 #root.ldap_fac=org.jasig.portal.security.provider.SimpleLdapSecurityContextFactory
 
-#securityContextProperty.propName=this would be a root context property
-#securityContextProperty.ldap_stu.connection=Students
-#securityContextProperty.ldap_fac.connection=Faculty
+#!!!!! PLEASE NOTE, THE NAMING CONVENTION HAS CHANGED AS OF 2.4.1 !!!!!
+# A context property for the 'root' context
+#securityContextProperty.root.propName=this would be a context property for the 'root' context
+# A context property for the 'root.ldap_stu' context
+#securityContextProperty.root.ldap_stu.connection=Students
+#securityContextProperty.root.ldap_fac.connection=Faculty
 
 
 # Answers what tokens are examined in the request for each context during authentication.