Index: calendar/tags/sakai_2-4-1_QA_001/calendar-summary-tool/tool/project.xml =================================================================== --- calendar/tags/sakai_2-4-1_QA_001/calendar-summary-tool/tool/project.xml (revision 33692) +++ calendar/tags/sakai_2-4-1_QA_001/calendar-summary-tool/tool/project.xml (revision 33693) @@ -147,7 +147,7 @@ myfaces tomahawk - 1.1.3 + 1.1.6 true Index: calendar/tags/sakai_2-4-1_QA_001/calendar-summary-tool/tool/pom.xml =================================================================== --- calendar/tags/sakai_2-4-1_QA_001/calendar-summary-tool/tool/pom.xml (revision 33692) +++ calendar/tags/sakai_2-4-1_QA_001/calendar-summary-tool/tool/pom.xml (revision 33693) @@ -131,6 +131,14 @@ org.apache.myfaces.core myfaces-api 1.1.5 + + + + commons-lang + commons-lang + + + org.apache.myfaces.core @@ -140,7 +148,14 @@ org.apache.myfaces.tomahawk tomahawk - 1.1.3 + 1.1.6 + + + + antlr + antlr + + @@ -156,18 +171,6 @@ commons-codec 1.3 - - - org.apache.myfaces.tomahawk - tomahawk - 1.1.3 - - - - javax.servlet - jstl - 1.1.2 - Index: usermembership/tags/sakai_2-4-1_QA_001/tool/project.xml =================================================================== --- usermembership/tags/sakai_2-4-1_QA_001/tool/project.xml (revision 33693) +++ usermembership/tags/sakai_2-4-1_QA_001/tool/project.xml (revision 33694) @@ -144,7 +144,7 @@ myfaces tomahawk - 1.1.3 + 1.1.6 true Index: usermembership/tags/sakai_2-4-1_QA_001/tool/pom.xml =================================================================== --- usermembership/tags/sakai_2-4-1_QA_001/tool/pom.xml (revision 33693) +++ usermembership/tags/sakai_2-4-1_QA_001/tool/pom.xml (revision 33694) @@ -138,19 +138,19 @@ - myfaces + org.apache.myfaces.core myfaces-api 1.1.5 - myfaces + org.apache.myfaces.core myfaces-impl 1.1.5 - myfaces + org.apache.myfaces.tomahawk tomahawk - 1.1.3 + 1.1.6 Index: blog/tags/sakai_2-4-1_QA_001/tool/project.xml =================================================================== --- blog/tags/sakai_2-4-1_QA_001/tool/project.xml (revision 33694) +++ blog/tags/sakai_2-4-1_QA_001/tool/project.xml (revision 33695) @@ -230,7 +230,7 @@ myfaces tomahawk - 1.1.3 + 1.1.6 jar true @@ -278,4 +278,4 @@ - \ No newline at end of file + Index: jsf/tags/sakai_2-4-1_QA_001/widgets/pom.xml =================================================================== --- jsf/tags/sakai_2-4-1_QA_001/widgets/pom.xml (revision 33695) +++ jsf/tags/sakai_2-4-1_QA_001/widgets/pom.xml (revision 33696) @@ -92,7 +92,7 @@ org.apache.myfaces.tomahawk tomahawk - 1.1.3 + 1.1.6 @@ -127,12 +127,12 @@ - - - - - - + + + + + + ${basedir}/src/bundle @@ -154,6 +154,6 @@ - + Index: jsf/tags/sakai_2-4-1_QA_001/example/project.xml =================================================================== --- jsf/tags/sakai_2-4-1_QA_001/example/project.xml (revision 33695) +++ jsf/tags/sakai_2-4-1_QA_001/example/project.xml (revision 33696) @@ -89,7 +89,7 @@ myfaces tomahawk - 1.1.3 + 1.1.6 true @@ -230,7 +230,7 @@ true - + commons-lang commons-lang Index: jsf/tags/sakai_2-4-1_QA_001/example/pom.xml =================================================================== --- jsf/tags/sakai_2-4-1_QA_001/example/pom.xml (revision 33695) +++ jsf/tags/sakai_2-4-1_QA_001/example/pom.xml (revision 33696) @@ -42,12 +42,12 @@ org.apache.myfaces.tomahawk tomahawk - 1.1.3 + 1.1.6 - + org.sakaiproject sakai-jsf-widgets ${sakai.version} @@ -56,7 +56,7 @@ - + org.sakaiproject sakai-jsf-widgets-myfaces ${sakai.version} @@ -150,12 +150,12 @@ - - - - - - + + + + + + ${basedir}/src/bundle @@ -170,6 +170,6 @@ - + Index: jsf/tags/sakai_2-4-1_QA_001/widgets-myfaces/project.xml =================================================================== --- jsf/tags/sakai_2-4-1_QA_001/widgets-myfaces/project.xml (revision 33695) +++ jsf/tags/sakai_2-4-1_QA_001/widgets-myfaces/project.xml (revision 33696) @@ -44,7 +44,7 @@ myfaces tomahawk - 1.1.3 + 1.1.6 Index: jsf/tags/sakai_2-4-1_QA_001/widgets-myfaces/pom.xml =================================================================== --- jsf/tags/sakai_2-4-1_QA_001/widgets-myfaces/pom.xml (revision 33695) +++ jsf/tags/sakai_2-4-1_QA_001/widgets-myfaces/pom.xml (revision 33696) @@ -32,6 +32,11 @@ 1.1.5 + org.apache.myfaces.tomahawk + tomahawk + 1.1.6 + + org.apache.myfaces.core myfaces-impl 1.1.5 @@ -65,12 +70,12 @@ - - - - - - + + + + + + ${basedir}/src/bundle @@ -92,6 +97,6 @@ - + Index: sections/tags/sakai_2-4-1_QA_001/sections-app-util/project.xml =================================================================== --- sections/tags/sakai_2-4-1_QA_001/sections-app-util/project.xml (revision 33696) +++ sections/tags/sakai_2-4-1_QA_001/sections-app-util/project.xml (revision 33697) @@ -70,7 +70,7 @@ myfaces tomahawk - 1.1.3 + 1.1.6 true Index: sections/tags/sakai_2-4-1_QA_001/sections-app-util/pom.xml =================================================================== --- sections/tags/sakai_2-4-1_QA_001/sections-app-util/pom.xml (revision 33696) +++ sections/tags/sakai_2-4-1_QA_001/sections-app-util/pom.xml (revision 33697) @@ -63,7 +63,7 @@ org.apache.myfaces.tomahawk tomahawk - 1.1.3 + 1.1.6 Index: sections/tags/sakai_2-4-1_QA_001/sections-app/project.xml =================================================================== --- sections/tags/sakai_2-4-1_QA_001/sections-app/project.xml (revision 33696) +++ sections/tags/sakai_2-4-1_QA_001/sections-app/project.xml (revision 33697) @@ -300,7 +300,7 @@ myfaces tomahawk - 1.1.3 + 1.1.6 true Index: sections/tags/sakai_2-4-1_QA_001/sections-app/pom.xml =================================================================== --- sections/tags/sakai_2-4-1_QA_001/sections-app/pom.xml (revision 33696) +++ sections/tags/sakai_2-4-1_QA_001/sections-app/pom.xml (revision 33697) @@ -305,7 +305,7 @@ org.apache.myfaces.tomahawk tomahawk - 1.1.3 + 1.1.6 Index: chat/tags/sakai_2-4-1_QA_001/chat-tool/tool/project.xml =================================================================== --- chat/tags/sakai_2-4-1_QA_001/chat-tool/tool/project.xml (revision 33697) +++ chat/tags/sakai_2-4-1_QA_001/chat-tool/tool/project.xml (revision 33698) @@ -310,7 +310,7 @@ myfaces tomahawk - 1.1.3 + 1.1.6 true Index: chat/tags/sakai_2-4-1_QA_001/chat-tool/tool/pom.xml =================================================================== --- chat/tags/sakai_2-4-1_QA_001/chat-tool/tool/pom.xml (revision 33697) +++ chat/tags/sakai_2-4-1_QA_001/chat-tool/tool/pom.xml (revision 33698) @@ -159,89 +159,75 @@ sakai-velocity-tool ${sakai.version} - - - jsf - jsf-api - 1.1.01 - - - - jsf - jsf-impl - 1.1.01 - - - - javax.servlet - jsp-api - 2.0 - - - - javax.servlet - servlet-api - 2.4 - - - - javax.servlet - jstl - 1.0.2 - - - - org.sakaiproject - sakai-jsf-tool - ${sakai.version} - - - - org.sakaiproject - sakai-jsf-app - ${sakai.version} - - - - org.sakaiproject - sakai-jsf-widgets - ${sakai.version} - - - - org.sakaiproject - sakai-jsf-widgets-sun - ${sakai.version} - - - - commons-digester - commons-digester - 1.6 - - - - commons-collections - commons-collections - 3.1 - - - - commons-beanutils - commons-beanutils - 1.7.0 - - - - taglibs - standard - 1.0.4 - - - - - - + + jsf + jsf-api + 1.1.01 + + + jsf + jsf-impl + 1.1.01 + + + javax.servlet + jsp-api + 2.0 + + + javax.servlet + servlet-api + ${sakai.servletapi.version} + + + javax.servlet + jstl + 1.0.2 + + + org.sakaiproject + sakai-jsf-tool + ${sakai.version} + + + org.sakaiproject + sakai-jsf-app + ${sakai.version} + + + + org.sakaiproject + sakai-depend-jsf-widgets-sun + ${sakai.version} + pom + + + + org.apache.myfaces.tomahawk + tomahawk + 1.1.6 + compile + + + commons-digester + commons-digester + 1.6 + + + commons-collections + commons-collections + 3.1 + + + commons-beanutils + commons-beanutils + 1.7.0 + + + taglibs + standard + 1.0.4 + Index: osp/tags/sakai_2-4-1_QA_001/jsf/widgets/pom.xml =================================================================== --- osp/tags/sakai_2-4-1_QA_001/jsf/widgets/pom.xml (revision 33698) +++ osp/tags/sakai_2-4-1_QA_001/jsf/widgets/pom.xml (revision 33699) @@ -101,7 +101,7 @@ org.apache.myfaces.tomahawk tomahawk - 1.1.3 + 1.1.6 Index: roster/tags/sakai_2-4-1_QA_001/roster-app/project.xml =================================================================== --- roster/tags/sakai_2-4-1_QA_001/roster-app/project.xml (revision 33699) +++ roster/tags/sakai_2-4-1_QA_001/roster-app/project.xml (revision 33700) @@ -74,7 +74,7 @@ myfaces tomahawk - 1.1.3 + 1.1.6 true Index: gradebook/tags/sakai_2-4-1_QA_001/app/project.xml =================================================================== --- gradebook/tags/sakai_2-4-1_QA_001/app/project.xml (revision 33700) +++ gradebook/tags/sakai_2-4-1_QA_001/app/project.xml (revision 33701) @@ -284,7 +284,7 @@ myfaces tomahawk - 1.1.3 + 1.1.6 true Index: gradebook/tags/sakai_2-4-1_QA_001/testservice-tool/project.xml =================================================================== --- gradebook/tags/sakai_2-4-1_QA_001/testservice-tool/project.xml (revision 33700) +++ gradebook/tags/sakai_2-4-1_QA_001/testservice-tool/project.xml (revision 33701) @@ -79,7 +79,7 @@ myfaces tomahawk - 1.1.3 + 1.1.6 true Index: content/tags/sakai_2-4-1_QA_001/content-impl/impl/src/java/org/sakaiproject/content/impl/BaseContentService.java =================================================================== --- content/tags/sakai_2-4-1_QA_001/content-impl/impl/src/java/org/sakaiproject/content/impl/BaseContentService.java (revision 33701) +++ content/tags/sakai_2-4-1_QA_001/content-impl/impl/src/java/org/sakaiproject/content/impl/BaseContentService.java (revision 33702) @@ -944,7 +944,7 @@ { // only for /group-user/SITEID/USERID/ refs. String[] parts = StringUtil.split(id, "/"); - if (parts.length >= 4) + if (parts.length >= 3) { return AUTH_DROPBOX_MAINTAIN; } Index: content/tags/sakai_2-4-1_QA_001/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java =================================================================== --- content/tags/sakai_2-4-1_QA_001/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java (revision 33702) +++ content/tags/sakai_2-4-1_QA_001/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java (revision 33703) @@ -905,8 +905,8 @@ context.put ("collectionId", collectionId); String homeCollectionId = (String) (String) state.getAttribute (STATE_HOME_COLLECTION_ID); context.put("homeCollectionId", homeCollectionId); - List cPath = getCollectionPath(state); - context.put ("collectionPath", cPath); + //List cPath = getCollectionPath(state); + //context.put ("collectionPath", cPath); String navRoot = (String) state.getAttribute(STATE_NAVIGATION_ROOT); context.put("navRoot", navRoot); @@ -2245,8 +2245,11 @@ boolean canRead = contentService.allowGetCollection(id) || contentService.allowGetResource(id); item.setCanRead(canRead); - String url = contentService.getUrl(id); - item.setUrl(url); + if(canRead) + { + String url = contentService.getUrl(id); + item.setUrl(url); + } item.setLast(collectionPath.isEmpty()); if(id.equals(homeCollectionId)) Index: content/tags/sakai_2-4-1_QA_001/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm =================================================================== --- content/tags/sakai_2-4-1_QA_001/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm (revision 33702) +++ content/tags/sakai_2-4-1_QA_001/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm (revision 33703) @@ -63,13 +63,7 @@ folder #foreach ($item in $collectionPath) #if($item.isLast()) - #if ($dropboxMode && $velocityCount == 1) - $siteTitle $tlang.getString("gen.drop") - #elseif($velocityCount == 1) - $siteTitle $tlang.getString("gen.reso") - #else - $validator.escapeHtml("$item.name") - #end + $validator.escapeHtml("$item.name") #if($upOneLevel) #end - #else + #elseif($item.canRead()) - ## - #if ($dropboxMode && $velocityCount == 1) - $siteTitle $tlang.getString("gen.drop") - #elseif($velocityCount == 1) - $siteTitle $tlang.getString("gen.reso") - #else - $validator.escapeHtml("$item.name") - #end + $validator.escapeHtml("$item.name") / #set($upOneLevel = $item) + #else + $validator.escapeHtml("$item.name") #end #end Index: reference/tags/sakai_2-4-1_QA_001/library/src/webapp/content/gateway/acknowledgments.html =================================================================== --- reference/tags/sakai_2-4-1_QA_001/library/src/webapp/content/gateway/acknowledgments.html (revision 33703) +++ reference/tags/sakai_2-4-1_QA_001/library/src/webapp/content/gateway/acknowledgments.html (revision 33704) @@ -1,30 +1,36 @@ - - - - Acknowledgments - - - - + + + + Acknowledgments + + +
- OSI Certified -

Copyright 2003-2006 The Sakai Foundation. All rights reserved. Sakai is licensed for use pursuant to the Educational Community License v. 1.0. Portions of Sakai are copyrighted by other parties, including the parties listed below, and you should see the licenses directory for complete copyright and licensing information.

+ OSI Certified +

Copyright 2003-2007 The Sakai Foundation. All rights reserved. Sakai is licensed for use pursuant to the Educational Community License v. 1.0. +Portions of Sakai are copyrighted by other parties, including the +parties listed below, and you should see the licenses directory for +complete copyright and licensing information.

Acknowledgments

-

Portions of Sakai were developed by MIT, Indiana University, Stanford University, University of Michigan, and University of California Berkeley. (http://www.sakaiproject.org/).

+

Portions +of Sakai were developed by MIT, Indiana University, Stanford +University, University of Michigan, and University of California +Berkeley. (http://www.sakaiproject.org/).

This product includes software developed by the Apache Software Foundation (http://www.apache.org).

The jaxen library is provided by The Werken Company. (http://jaxen.werken.com/).

This product includes software developed by the JDOM Project (http://www.jdom.org/).

This product includes software developed by the Pluto Project (http://portals.apache.org/pluto/).

-

This product includes software developed by the DOM4J Project (http://www.dom4j.org).

+

This product includes software developed by the DOM4J Project (http://www.dom4j.org).

This product includes software developed by the MX4J project (http://sourceforge.net/projects/mx4j).

This product includes software developed by the SAXPath Project (http://sourceforge.net/projects/saxpath).

-

This product includes copyrighted software developed by E. Wray Johnson for use and distribution by the Object Data Management Group (http://www.odmg.org/).

+

This +product includes copyrighted software developed by E. Wray Johnson for +use and distribution by the Object Data Management Group (http://www.odmg.org/).

Portions Copyright (c) 1999 Sun Microsystems, Inc. All Rights Reserved.

WebSPHINX is Copyright (c) 1998-2002 - Carnegie Mellon University.

This product includes Silk Icons developed by Mark James and are available at (http://www.famfamfam.com/lab/icons/silk/)

- - + Index: gradebook/tags/sakai_2-4-1_QA_001/app/ui/src/webapp/overview.jsp =================================================================== --- gradebook/tags/sakai_2-4-1_QA_001/app/ui/src/webapp/overview.jsp (revision 33892) +++ gradebook/tags/sakai_2-4-1_QA_001/app/ui/src/webapp/overview.jsp (revision 33893) @@ -53,7 +53,8 @@ - + @@ -66,7 +67,8 @@ - + @@ -88,7 +90,8 @@ - +