cvs commit: jakarta-jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet IFramePortlet.java

[ate]

ate 2004/10/15 15:58:43

  Modified:applications/pam/src/java/org/apache/jetspeed/portlets/pam
PortletApplicationDetail.java
   components/page-manager/src/java/org/apache/jetspeed/page/impl
DatabasePageManager.java CastorXmlPageManager.java
   components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl
StandardResolver.java GroupCriterionResolver.java
RoleCriterionResolver.java
   components/jetspeed/src/java/org/apache/jetspeed/rewriter/html/neko
URLRewriterFilter.java
   jetspeed-api/src/java/org/apache/jetspeed/page
PageManager.java
   components/locator/src/java/org/apache/jetspeed/profiler/impl
ProfileFallbackIterator.java
   applications/jsf-demo/src/java/guessNumber
MessageFactory.java
   applications/pam/src/java/org/apache/jetspeed/portlets/security/users
UserManagerPortlet.java
   jetspeed-api/src/java/org/apache/jetspeed/om/folder
FolderNotFoundException.java
   portals-bridges/myfaces/src/java/org/apache/portals/bridges/myfaces
PortletFacesContextImpl.java
   portal/src/java/org/apache/jetspeed/profiler/impl
ProfilerValveImpl.java
   portal/src/java/org/apache/jetspeed/services/information
PortletURLProviderImpl.java
   components/web-content/src/java/org/apache/jetspeed/portlet
IFramePortlet.java
  Log:
  Cleanup of all unused imports
  
  Revision  ChangesPath
  1.34  +1 -2  
jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.java
  
  Index: PortletApplicationDetail.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- PortletApplicationDetail.java 15 Oct 2004 18:44:56 -  1.33
  +++ PortletApplicationDetail.java 15 Oct 2004 22:58:43 -  1.34
  @@ -19,7 +19,6 @@
   
   import java.io.IOException;
   import java.util.ArrayList;
  -import java.util.Collection;
   import java.util.Iterator;
   import java.util.LinkedHashMap;
   import java.util.Locale;
  
  
  
  1.9   +1 -2  
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java
  
  Index: DatabasePageManager.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DatabasePageManager.java  15 Oct 2004 06:57:50 -  1.8
  +++ DatabasePageManager.java  15 Oct 2004 22:58:43 -  1.9
  @@ -16,7 +16,6 @@
   package org.apache.jetspeed.page.impl;
   
   import java.util.HashMap;
  -import java.util.Iterator;
   import java.util.List;
   import java.util.Map;
   
  
  
  
  1.16  +1 -3  
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java
  
  Index: CastorXmlPageManager.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- CastorXmlPageManager.java 15 Oct 2004 06:57:50 -  1.15
  +++ CastorXmlPageManager.java 15 Oct 2004 22:58:43 -  1.16
  @@ -28,7 +28,6 @@
   import java.util.List;
   import java.util.Map;
   import java.util.Set;
  -import java.util.StringTokenizer;
   
   import org.apache.commons.collections.map.LRUMap;
   import org.apache.commons.logging.Log;
  @@ -38,7 +37,6 @@
   import org.apache.jetspeed.om.folder.DocumentSet;
   import org.apache.jetspeed.om.folder.DocumentSetPath;
   import org.apache.jetspeed.om.folder.Folder;
  -import org.apache.jetspeed.om.folder.FolderMetaData;
   import org.apache.jetspeed.om.folder.FolderNotFoundException;
   import org.apache.jetspeed.om.folder.impl.FolderImpl;
   import org.apache.jetspeed.om.folder.InvalidFolderException;
  
  
  
  1.5   +1 -2  
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/StandardResolver.java
  
  Index: StandardResolver.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/S

cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF .cvsignore

[ate]

ate 2004/10/15 15:56:20

  Added:   portal/src/webapp/WEB-INF .cvsignore
  Log:
  Prevent search_index/segments getting checked in
  
  Revision  ChangesPath
  1.1  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/.cvsignore
  
  Index: .cvsignore
  ===
  search_index
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[jira] Closed: (JS2-149) Implementing PLT.7.1 PortletURL request parameter name and value encoding

[jetspeed-dev]

Message:

   The following issue has been closed.

   Resolver: Ate Douma
   Date: Fri, 15 Oct 2004 3:33 PM

Feature implemented.
-
View the issue:
  http://issues.apache.org/jira/browse/JS2-149

Here is an overview of the issue:
-
Key: JS2-149
Summary: Implementing PLT.7.1 PortletURL request parameter name and value encoding
   Type: Improvement

 Status: Closed
   Priority: Major
 Resolution: FIXED

Project: Jetspeed 2
 Components: 
 Container
   Fix Fors:
 2.0-M1
   Versions:
 2.0-M1

   Assignee: Ate Douma
   Reporter: Ate Douma

Created: Fri, 15 Oct 2004 2:07 PM
Updated: Fri, 15 Oct 2004 3:33 PM

Description:
Several weeks ago I started a discussion on the developers list concerning
"Handling encoding requirements for the Portal URL":
   http://nagoya.apache.org/eyebrowse/ReadMsg?listId=22&msgNo=17318

I proposed an initial solution which, after a good discussion, resulted in a radical 
new proposal from Raphaël Luta:
   http://nagoya.apache.org/eyebrowse/ReadMsg?listId=22&msgNo=17320

This, I have been working on for the last month bit by bit.

The resulting new URL encoding is a complete replacement of the current one which is 
based on the original Pluto code base.
The problem with the current version is, for the most part, the strong coupling 
between the several components involved, 
making it very difficult to extend and maintain.
So, I rewrote it from scratch and have now a new Portlet URL encoding which is much 
smaller and easily extendable.

Furthermore it has several, partly new, configurable features:
- Choice where the state is maintained and to which extend:
  - all in the url (like Pluto does): 
  o.a.j.container.state.impl.PathNavigationalState
  - windowstate and portletmode in the session (as the current J2 default): 
  o.a.j.container.state.impl.SessionNavigationalState
  - all the state in the session, including last used request parameters (new):
  o.a.j.container.state.impl.SessionFullNavigationalState
- Choice where the state is encoded in the url:
  - as a single path info parameter (somewhat like the current encoding):
  o.a.j.container.url.impl.PathInfoEncodingPortalURL
  - as a single query string parameter (new):
  o.a.j.container.url.impl.QueryStringEncodingPortalURL
- Choice how the state is encoded (new):
  - currently one supplied implementation using Base64 encoding (thereby solving the 
specs requirements in one go):
  o.a.j.container.state.impl.JetspeedNavigationalStateCodec

All the above implementations can easily be replaced or enhanced as needed. 
So, other portals embedding Jetspeed 2 can supply their own if needed, like J1/Fusion 
or Jahia.
Because the new default encoding reduces the navigational state to only one parameter, 
this is now a much easier and clearer task.

For J1/Fusion this *still* has to be done and will be worked on next week.

Configuring the new implementation is done in two locations:
- jetspeed-spring.xml:

  
  
org.apache.jetspeed.container.state.impl.SessionFullNavigationalState
org.apache.jetspeed.container.url.impl.PathInfoEncodingPortalURL
org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateCodec
  

- jetspeed.properties:

  #--
  # Portal URL NavigationalState Parameter Name (default: _ns)
  #--
  portalurl.navigationalstate.parameter.name=_ns

Not implemented feature: gzipping the navigational state parameter before encoding in 
with Base64.
In his proposal, Raphaël suggested further optimizing the encoding of the navigational 
state using gzip.
I actually did implement that but it turned out that in almost no (or very unlikely 
situation like one letter repeated a 100x)
this resulted in an improvement/shorter url. So, I dropped this!

Restrictions now truly enforced:
In the current J2 code base there were a few PortletURL usages which won't work now 
anymore.
These are *not* restrictions of the implementation but of the Portlet Specification!
- Manipulating the created PortletURL:
  In a few instances, portlet request parameter values were modified *after* the 
PortletURL was created.
  This seemed a smart thing to do because the url could be reused that way.
  But, the Portlet Specification explicitly says NO on that:
"Portlet developers should be aware that the string representation of a PortletURL 
may not be a well formed URL
 but a special token at the time the portlet is generating its content." (PLT.7.1)
  Because the whole navigational state (including request parameters) are now encoded 
in one Base64 encoded parameter, 
  it is NOT possible anymore to modify a created url anymore.

- Using HTTP GET as 

cvs commit: jakarta-jetspeed-2/portals-bridges/myfaces/src/java/org/apache/portals/bridges/myfaces PortletViewHandlerImpl.java FacesPortlet.java

[taylor]

taylor  2004/10/15 14:47:45

  Modified:portals-bridges/myfaces/src/java/org/apache/portals/bridges/myfaces
PortletViewHandlerImpl.java FacesPortlet.java
  Log:
  Resolved JSF state issues:
  
  http://nagoya.apache.org/jira/browse/JS2-147
  
  Started on first JSF production portlet:
  
  http://nagoya.apache.org/jira/browse/JS2-150
  
  Revision  ChangesPath
  1.4   +1 -6  
jakarta-jetspeed-2/portals-bridges/myfaces/src/java/org/apache/portals/bridges/myfaces/PortletViewHandlerImpl.java
  
  Index: PortletViewHandlerImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portals-bridges/myfaces/src/java/org/apache/portals/bridges/myfaces/PortletViewHandlerImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PortletViewHandlerImpl.java   14 Oct 2004 00:20:15 -  1.3
  +++ PortletViewHandlerImpl.java   15 Oct 2004 21:47:44 -  1.4
  @@ -81,9 +81,7 @@
*  java.lang.String)
*/
   public UIViewRoot createView(FacesContext facesContext, String viewId)
  -{
  -System.out.println("Creating view: " + viewId);
  -
  +{
   UIViewRoot root = handler.createView(facesContext, viewId);
   if (root != null)
   {
  @@ -124,7 +122,6 @@
*/
   public void renderView(FacesContext facesContext, UIViewRoot viewToRender) 
throws IOException, FacesException
   {
  -System.out.println("Rendering view: " + viewToRender);
   handler.renderView(facesContext, viewToRender);
   }
   
  @@ -134,13 +131,11 @@
*/
   public UIViewRoot restoreView(FacesContext facesContext, String viewId)
   {
  -System.out.println("restoring view: " + viewId);
   UIViewRoot root = handler.restoreView(facesContext, viewId);
   if (root != null)
   {
   facesContext.setViewRoot(root);
   }
  -// System.out.println("Rendering view root: " + root);
   return root;
   }
   
  
  
  
  1.7   +7 -1  
jakarta-jetspeed-2/portals-bridges/myfaces/src/java/org/apache/portals/bridges/myfaces/FacesPortlet.java
  
  Index: FacesPortlet.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portals-bridges/myfaces/src/java/org/apache/portals/bridges/myfaces/FacesPortlet.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FacesPortlet.java 14 Oct 2004 00:20:15 -  1.6
  +++ FacesPortlet.java 15 Oct 2004 21:47:44 -  1.7
  @@ -399,6 +399,8 @@
   log.trace("Begin Executing phases");
   }
   
  +preProcessFaces(context);
  +
   // Execute the pre-render request processing lifecycle for this request
   try
   {
  @@ -469,6 +471,11 @@
   }
   }
   
  +protected void preProcessFaces(FacesContext context)
  +{
  +}
  +
  +
   private String createViewRootKey(FacesContext context, String defaultView)
   {
   PortletRequest portletRequest = (PortletRequest) 
context.getExternalContext().getRequest();
  @@ -489,7 +496,6 @@
   {
   key = key + ":" + view;
   }
  -System.out.println("KEY [" + key + "]");
   return key;
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portals-bridges/struts/src/java/org/apache/portals/bridges/struts StrutsPortlet.java StrutsPortletURL.java

[ate]

ate 2004/10/15 14:47:26

  Modified:applications/demo/src/webapp/WEB-INF/demo/preference
pref-view.jsp
   layout-portlets/src/java/org/apache/jetspeed/portlets/layout
MultiColumnPortlet.java LayoutPortlet.java
   taglibs/treecontrol/src/java/org/apache/jetspeed/portlets/tags
PortletTreeControlTag.java
   ..classpath
   portals-bridges/struts/src/java/org/apache/portals/bridges/struts
StrutsPortlet.java StrutsPortletURL.java
  Log:
  Implementing PLT.7.1 PortletURL request parameter name and value encoding
  See: http://issues.apache.org/jira/browse/JS2-149
  
  Revision  ChangesPath
  1.7   +5 -5  
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/preference/pref-view.jsp
  
  Index: pref-view.jsp
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/preference/pref-view.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- pref-view.jsp 9 Sep 2004 22:08:17 -   1.6
  +++ pref-view.jsp 15 Oct 2004 21:47:25 -  1.7
  @@ -25,12 +25,12 @@
   

   

   

  +

  +

   

  -

  -

  -  

  -

  -

  +

  +  

  +

   ">

   

   

  
  
  
  1.6   +1 -1  
jakarta-jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
  
  Index: MultiColumnPortlet.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MultiColumnPortlet.java   23 Sep 2004 03:29:29 -  1.5
  +++ MultiColumnPortlet.java   15 Oct 2004 21:47:25 -  1.6
  @@ -69,7 +69,7 @@
   public void doView( RenderRequest request, RenderResponse response ) throws 
PortletException, IOException
   {
   RequestContext context = Jetspeed.getCurrentRequestContext();
  -PortletWindow window = 
context.getNavigationalState().getMaximizedWindow(context.getPage());
  +PortletWindow window = 
context.getPortalURL().getNavigationalState().getMaximizedWindow();
   
   if (request.getParameter("moveBy") != null && 
request.getParameter("fragmentId") != null)
   {
  
  
  
  1.6   +1 -1  
jakarta-jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
  
  Index: LayoutPortlet.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LayoutPortlet.java6 Oct 2004 23:44:55 -   1.5
  +++ LayoutPortlet.java15 Oct 2004 21:47:25 -  1.6
  @@ -93,7 +93,7 @@
   response.setContentType("text/html");
   
   RequestContext context = Jetspeed.getCurrentRequestContext();
  -PortletWindow window = 
context.getNavigationalState().getMaximizedWindow(context.getPage());
  +PortletWindow window = 
context.getPortalURL().getNavigationalState().getMaximizedWindow();
   boolean maximized = (window != null);
   
   request.setAttribute(PortalReservedParameters.PAGE_ATTRIBUTE_KEY, 
getPage(request));
  
  
  
  1.4   +14 -7 
jakarta-jetspeed-2/taglibs/treecontrol/src/java/org/apache/jetspeed/portlets/tags/PortletTreeControlTag.java
  
  Index: PortletTreeControlTag.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/taglibs/treecontrol/src/java/org/apache/jetspeed/portlets/tags/PortletTreeControlTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PortletTreeControlTag.java2 Sep 2004 15:15:33 -   1.3
  +++ PortletTreeControlTag.java15 Oct 2004 21:47:25 -  1.4
  @@ -160,19 +160,22 @@
   // character in parameter values. 
   String encodedNodeName = URLEncoder.encode(node.getName());
   
  -String action = replace(getAction(), "${name}", encodedNodeName);
  +PortletURL treeActionUrl = renderResponse.createActionURL();
  +treeActionUrl.setParameter("node", node.getName());
  +String treeAction = treeActionUrl.toString();
  +//String action = replace(getAction(), "${name}", encodedNodeName);
   
   
  -String updateTreeAction =
  -replace(getAction(), "tree=${name}", "select=" + encodedNodeName);
  -updateTreeAction =
  -((HttpServletResponse) pageContext.getResponse()).
  -encodeURL(updateTreeAction);
  +//String updateTree

cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative user-admin.ds

[taylor]

taylor  2004/10/15 14:47:13

  Modified:portal/src/webapp/WEB-INF/pages/_role/manager
default-page.psml
   portal/src/webapp/WEB-INF/pages/Administrative user-admin.ds
  Log:
  Resolved JSF state issues:
  
  http://nagoya.apache.org/jira/browse/JS2-147
  
  Started on first JSF production portlet:
  
  http://nagoya.apache.org/jira/browse/JS2-150
  
  Revision  ChangesPath
  1.3   +4 -0  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/manager/default-page.psml
  
  Index: default-page.psml
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/manager/default-page.psml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- default-page.psml 15 Oct 2004 16:13:42 -  1.2
  +++ default-page.psml 15 Oct 2004 21:47:13 -  1.3
  @@ -30,5 +30,9 @@
 
 
   
  +
  +  
  +  
  +
 
   
  
  
  
  1.3   +1 -0  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/user-admin.ds
  
  Index: user-admin.ds
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/user-admin.ds,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- user-admin.ds 15 Oct 2004 16:27:28 -  1.2
  +++ user-admin.ds 15 Oct 2004 21:47:13 -  1.3
  @@ -3,4 +3,5 @@
 Users Admin Pages
 user-admin
 /Administrative/user-mgt.psml
  +  /Administrative/users-jsf.psml
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[jira] Created: (JS2-150) Profiler Admin

[jetspeed-dev]

Message:

  A new issue has been created in JIRA.

-
View the issue:
  http://issues.apache.org/jira/browse/JS2-150

Here is an overview of the issue:
-
Key: JS2-150
Summary: Profiler Admin
   Type: New Feature

 Status: Unassigned
   Priority: Major

Project: Jetspeed 2
 Components: 
 Admin Portlets
   Fix Fors:
 2.0-dev/cvs
   Versions:
 2.0-dev/cvs

   Assignee: 
   Reporter: David Sean Taylor

Created: Fri, 15 Oct 2004 2:48 PM
Updated: Fri, 15 Oct 2004 2:48 PM

Description:
Implement UI for Profiler Admin. 


-
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://issues.apache.org/jira/secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/applications/pam project.xml

[taylor]

taylor  2004/10/15 14:46:46

  Modified:applications/pam/src/java/org/apache/jetspeed/portlets/security/users
UserData.java UserManagerPortlet.java
   applications/pam/src/java/org/apache/jetspeed/portlets/profiler
ProfilerAdminPortlet.java
   applications/pam/src/webapp/WEB-INF/view profiler-admin.jsp
   applications/pam/src/webapp/WEB-INF faces-config.xml
   applications/pam project.xml
  Added:   applications/pam/src/java/org/apache/jetspeed/portlets/profiler
ProfileRulesExtent.java ProfileRuleForm.java
  Removed: applications/pam/src/java/org/apache/jetspeed/portlets/profiler
ProfileForm.java
  Log:
  Resolved JSF state issues:
  
  http://nagoya.apache.org/jira/browse/JS2-147
  
  Started on first JSF production portlet:
  
  http://nagoya.apache.org/jira/browse/JS2-150
  
  Revision  ChangesPath
  1.5   +8 -1  
jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/users/UserData.java
  
  Index: UserData.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/users/UserData.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- UserData.java 17 Sep 2004 00:18:58 -  1.4
  +++ UserData.java 15 Oct 2004 21:46:46 -  1.5
  @@ -17,9 +17,12 @@
   
   import java.security.Principal;
   import java.util.Iterator;
  +import java.util.Map;
   
  +import javax.faces.context.FacesContext;
   import javax.security.auth.Subject;
   
  +import org.apache.jetspeed.portlets.pam.PortletApplicationResources;
   import org.apache.jetspeed.security.User;
   import org.apache.jetspeed.security.UserManager;
   import org.apache.jetspeed.security.UserPrincipal;
  @@ -52,6 +55,10 @@
   UserManager userManager = 
   (UserManager)services.getService("UserManager");
   
  +Map appMap = 
(Map)FacesContext.getCurrentInstance().getExternalContext().getApplicationMap();
  +UserManager u2 = 
(UserManager)appMap.get(PortletApplicationResources.CPS_USER_MANAGER_COMPONENT);   
 
  +System.out.println("u2 == " + u2);
  +System.out.println("um == " + userManager);
   if (userManager == null)
   {
   return xusers;
  
  
  
  1.5   +8 -21 
jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java
  
  Index: UserManagerPortlet.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- UserManagerPortlet.java   18 Sep 2004 19:29:19 -  1.4
  +++ UserManagerPortlet.java   15 Oct 2004 21:46:46 -  1.5
  @@ -16,10 +16,10 @@
   package org.apache.jetspeed.portlets.security.users;
   
   import java.security.Principal;
  -import java.util.Hashtable;
   import java.util.Iterator;
  +import java.util.Map;
   
  -import javax.naming.Context;
  +import javax.faces.context.FacesContext;
   import javax.portlet.PortletConfig;
   import javax.portlet.PortletException;
   import javax.security.auth.Subject;
  @@ -31,9 +31,6 @@
   import org.apache.jetspeed.security.UserPrincipal;
   import org.apache.portals.bridges.myfaces.FacesPortlet;
   
  -import tyrex.naming.MemoryContext;
  -import tyrex.tm.RuntimeContext;
  -
   /**
* Provides maintenance capabilities for User Administration.
* 
  @@ -69,23 +66,13 @@
   {
   throw new PortletException(se);
   }
  -try
  -{
  -Hashtable env = new Hashtable();
  -env.put(Context.INITIAL_CONTEXT_FACTORY, 
"tyrex.naming.MemoryContextFactory");
  -Context root = new MemoryContext(null);
  -Context ctx = root.createSubcontext("comp");
  -ctx.bind("UserManager", userManager);
  -RuntimeContext runCtx = RuntimeContext.newRuntimeContext(root, null);
  -RuntimeContext.setRuntimeContext(runCtx);
  -}
  -catch (Exception e)
  -{
  -e.printStackTrace();
  -}
  -
   }
   
  +protected void preProcessFaces(FacesContext context)
  +{
  +System.out.println("*** pre processing faces for user manager: " + context);
  +}
  +
   public Principal getPrincipal(Subject subject, Class classe)
   {
   Principal principal = null;
  
  
  
  1.3   +13 -31
jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/profiler/ProfilerAdminPortlet.java
  
  Index: ProfilerA

[jira] Resolved: (JS2-147) JSF Bridge cannot keep state for 2..n UIViewRoots

[jetspeed-dev]

Message:

   The following issue has been resolved as FIXED.

   Resolver: David Sean Taylor
   Date: Fri, 15 Oct 2004 2:46 PM

Problems arise with 2 or more JSF portlets, even if they are on different pages. The 
PortletFacesContextImpl is now restoring the correct view.  
-
View the issue:
  http://issues.apache.org/jira/browse/JS2-147

Here is an overview of the issue:
-
Key: JS2-147
Summary: JSF Bridge cannot keep state for 2..n  UIViewRoots
   Type: Bug

 Status: Resolved
   Priority: Major
 Resolution: FIXED

Project: Jetspeed 2
 Components: 
 MyFaces Portlet Bridge
   Fix Fors:
 2.0-a1
   Versions:
 2.0-a1

   Assignee: David Sean Taylor
   Reporter: David Sean Taylor

Created: Tue, 12 Oct 2004 3:07 PM
Updated: Fri, 15 Oct 2004 2:46 PM

Description:
The JSF tree view and other components now seem to function properly when isolated 
inside one portlet. Problems arise with 2 or more JSF portlets, even if they are on 
different pages. The PortletFacesContextImpl restores the wrong view roots causin some 
ugly problems. Working on an approach to keep state for all active view roots by 
entity id + jsf view id.


-
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://issues.apache.org/jira/secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity JetspeedPowerTool.java

[ate]

ate 2004/10/15 14:44:32

  Modified:portal/src/java/org/apache/jetspeed/container/url/impl
AbstractPortalURL.java
   portal/src/webapp/WEB-INF/conf jetspeed.properties
   portal/src/java/org/apache/jetspeed/container
ContainerValve.java
   portal   project.xml
   portal/src/webapp/WEB-INF/assembly jetspeed-spring.xml
   portal/src/test/org/apache/jetspeed/engine
AbstractEngineTest.java TestSpringEngine.java
   portal/src/java/org/apache/jetspeed/engine/core
PortletActionProviderImpl.java
   portal/src/java/org/apache/jetspeed/aggregator/impl
PageAggregatorImpl.java BasicAggregator.java
   portal/src/java/org/apache/jetspeed/request
JetspeedRequestContext.java
JetspeedRequestContextComponent.java
   portal/src/java/org/apache/jetspeed/engine/servlet
ServletRequestImpl.java
   portal/src/java/org/apache/jetspeed/services/information
DynamicInformationProviderImpl.java
PortletURLProviderImpl.java
   portal/src/test/org/apache/jetspeed/test
JetspeedTestSuite.java
   portal/src/java/org/apache/jetspeed/velocity
JetspeedPowerTool.java
  Added:   portal/src/java/org/apache/jetspeed/container/url/impl
PathInfoEncodingPortalURL.java
QueryStringEncodingPortalURL.java
   portal/src/java/org/apache/jetspeed/container/state/impl
PortletWindowBaseNavigationalState.java
PortletWindowExtendedNavigationalState.java
SessionNavigationalState.java
AbstractNavigationalState.java
NavigationalStateCodec.java
PathNavigationalState.java
PortletWindowRequestNavigationalState.java
SessionFullNavigationalState.java
PortletWindowSessionNavigationalStates.java
JetspeedNavigationalStateComponent.java
PortletWindowRequestNavigationalStates.java
JetspeedNavigationalStateCodec.java
   portal/src/test/org/apache/jetspeed/container/state
TestNavigationalState.java
  Removed: portal/src/java/org/apache/jetspeed/container/url/impl
PortalControlParameterImpl.java
SessionPortalURL.java PathPortalURL.java
   portal/src/java/org/apache/jetspeed/container/session/impl
SessionNavigationalState.java
PathNavigationalState.java
JetspeedNavigationalStateComponent.java
PageStateImpl.java AbstractNavigationalState.java
   portal/src/test/org/apache/jetspeed/container/session
TestNavigationalState.java
  Log:
  Implementing PLT.7.1 PortletURL request parameter name and value encoding
  See: http://issues.apache.org/jira/browse/JS2-149
  
  Revision  ChangesPath
  1.11  +123 -455  
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java.diff?r1=1.10&r2=1.11
  
  
  1.1  
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java?rev=1.1
  
  
  1.1  
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/QueryStringEncodingPortalURL.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/QueryStringEncodingPortalURL.java?rev=1.1
  
  
  1.1  
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowBaseNavigationalState.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowBaseNavigationalState.java?rev=1.1
  
  
  1.1  
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowExtendedNavigationalState.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowExtendedNavigationalState.java?rev=1.1
  
  
  1.1  
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java
  
  
htt

cvs commit: jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/container/state - New directory

[ate]

ate 2004/10/15 14:44:25

  jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/container/state - New 
directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/state/impl - New directory

[ate]

ate 2004/10/15 14:44:25

  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/state/impl - New 
directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/state - New directory

[ate]

ate 2004/10/15 14:44:25

  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/state - New 
directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/mockobjects/request MockRequestContext.java

[ate]

ate 2004/10/15 14:41:43

  Modified:jetspeed-api/src/java/org/apache/jetspeed/container/url
PortalURL.java
   jetspeed-api/src/java/org/apache/jetspeed/request
RequestContext.java
   jetspeed-api/src/java/org/apache/jetspeed/mockobjects/request
MockRequestContext.java
  Added:   jetspeed-api/src/java/org/apache/jetspeed/container/state
FailedToCreateNavStateException.java
FailedToCreatePortalUrlException.java
FailedToCreatedNavStateCodecException.java
NavigationalState.java
NavigationalStateComponent.java
MutableNavigationalState.java
  Removed: jetspeed-api/src/java/org/apache/jetspeed/container/session
NavigationalState.java
FailedToCreateNavStateException.java PageState.java
FailedToCreatePortalUrlException.java
NavigationalStateComponent.java
   jetspeed-api/src/java/org/apache/jetspeed/container/url
PortalControlParameter.java
  Log:
  Implementing PLT.7.1 PortletURL request parameter name and value encoding
  See: http://issues.apache.org/jira/browse/JS2-149
  
  Revision  ChangesPath
  1.1  
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/container/state/FailedToCreateNavStateException.java
  
  Index: FailedToCreateNavStateException.java
  ===
  /*
   * Copyright 2000-2001,2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *  http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  package org.apache.jetspeed.container.state;
  
  import org.apache.jetspeed.exception.JetspeedRuntimeException;
  
  /**
   * 
   * FailedToCreateNavStateException
   * 
   * 
   *  Thrown if an attempt to create a [EMAIL PROTECTED] NavigationalState} met with 
an unexpected
   *  failure. 
   * 
   * @author mailto:[EMAIL PROTECTED]">Scott T. Weaver
   * @version $Id: FailedToCreateNavStateException.java,v 1.1 2004/10/15 21:41:43 ate 
Exp $
   *
   */
  public class FailedToCreateNavStateException extends JetspeedRuntimeException
  {
  
  /**
   * 
   */
  public FailedToCreateNavStateException()
  {
  super();
  // TODO Auto-generated constructor stub
  }
  
  /**
   * @param arg0
   */
  public FailedToCreateNavStateException( String arg0 )
  {
  super(arg0);
  // TODO Auto-generated constructor stub
  }
  
  /**
   * @param arg0
   */
  public FailedToCreateNavStateException( Throwable arg0 )
  {
  super(arg0);
  // TODO Auto-generated constructor stub
  }
  
  /**
   * @param arg0
   * @param arg1
   */
  public FailedToCreateNavStateException( String arg0, Throwable arg1 )
  {
  super(arg0, arg1);
  // TODO Auto-generated constructor stub
  }
  
  }
  
  
  
  1.1  
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/container/state/FailedToCreatePortalUrlException.java
  
  Index: FailedToCreatePortalUrlException.java
  ===
  /*
   * Copyright 2000-2001,2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *  http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  package org.apache.jetspeed.container.state;
  
  import org.apache.jetspeed.exception.JetspeedRuntimeException;
  
  /**
   * 
   * FailedToCreatePortalUrl
   * 
   * 
   *  Thrown if an attempt to create a Portal URL met with an unexpected
   *  failure. 
   * 
   * @author mailto:[EMAIL PROTECTED]">Scott T. Weaver
   * @version $Id: FailedToCreatePortalUrlException.java,v 1.1 2004/10/15 21:41:43 ate 
Exp 

cvs commit: jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/container/state - New directory

[ate]

ate 2004/10/15 14:41:38

  jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/container/state - New 
directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[jira] Created: (JS2-149) Implementing PLT.7.1 PortletURL request parameter name and value encoding

[jetspeed-dev]

Message:

  A new issue has been created in JIRA.

-
View the issue:
  http://issues.apache.org/jira/browse/JS2-149

Here is an overview of the issue:
-
Key: JS2-149
Summary: Implementing PLT.7.1 PortletURL request parameter name and value encoding
   Type: Improvement

 Status: Open
   Priority: Major

Project: Jetspeed 2
 Components: 
 Container
   Fix Fors:
 2.0-M1
   Versions:
 2.0-M1

   Assignee: Ate Douma
   Reporter: Ate Douma

Created: Fri, 15 Oct 2004 2:07 PM
Updated: Fri, 15 Oct 2004 2:07 PM

Description:
Several weeks ago I started a discussion on the developers list concerning
"Handling encoding requirements for the Portal URL":
   http://nagoya.apache.org/eyebrowse/ReadMsg?listId=22&msgNo=17318

I proposed an initial solution which, after a good discussion, resulted in a radical 
new proposal from Raphaël Luta:
   http://nagoya.apache.org/eyebrowse/ReadMsg?listId=22&msgNo=17320

This, I have been working on for the last month bit by bit.

The resulting new URL encoding is a complete replacement of the current one which is 
based on the original Pluto code base.
The problem with the current version is, for the most part, the strong coupling 
between the several components involved, 
making it very difficult to extend and maintain.
So, I rewrote it from scratch and have now a new Portlet URL encoding which is much 
smaller and easily extendable.

Furthermore it has several, partly new, configurable features:
- Choice where the state is maintained and to which extend:
  - all in the url (like Pluto does): 
  o.a.j.container.state.impl.PathNavigationalState
  - windowstate and portletmode in the session (as the current J2 default): 
  o.a.j.container.state.impl.SessionNavigationalState
  - all the state in the session, including last used request parameters (new):
  o.a.j.container.state.impl.SessionFullNavigationalState
- Choice where the state is encoded in the url:
  - as a single path info parameter (somewhat like the current encoding):
  o.a.j.container.url.impl.PathInfoEncodingPortalURL
  - as a single query string parameter (new):
  o.a.j.container.url.impl.QueryStringEncodingPortalURL
- Choice how the state is encoded (new):
  - currently one supplied implementation using Base64 encoding (thereby solving the 
specs requirements in one go):
  o.a.j.container.state.impl.JetspeedNavigationalStateCodec

All the above implementations can easily be replaced or enhanced as needed. 
So, other portals embedding Jetspeed 2 can supply their own if needed, like J1/Fusion 
or Jahia.
Because the new default encoding reduces the navigational state to only one parameter, 
this is now a much easier and clearer task.

For J1/Fusion this *still* has to be done and will be worked on next week.

Configuring the new implementation is done in two locations:
- jetspeed-spring.xml:

  
  
org.apache.jetspeed.container.state.impl.SessionFullNavigationalState
org.apache.jetspeed.container.url.impl.PathInfoEncodingPortalURL
org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateCodec
  

- jetspeed.properties:

  #--
  # Portal URL NavigationalState Parameter Name (default: _ns)
  #--
  portalurl.navigationalstate.parameter.name=_ns

Not implemented feature: gzipping the navigational state parameter before encoding in 
with Base64.
In his proposal, Raphaël suggested further optimizing the encoding of the navigational 
state using gzip.
I actually did implement that but it turned out that in almost no (or very unlikely 
situation like one letter repeated a 100x)
this resulted in an improvement/shorter url. So, I dropped this!

Restrictions now truly enforced:
In the current J2 code base there were a few PortletURL usages which won't work now 
anymore.
These are *not* restrictions of the implementation but of the Portlet Specification!
- Manipulating the created PortletURL:
  In a few instances, portlet request parameter values were modified *after* the 
PortletURL was created.
  This seemed a smart thing to do because the url could be reused that way.
  But, the Portlet Specification explicitly says NO on that:
"Portlet developers should be aware that the string representation of a PortletURL 
may not be a well formed URL
 but a special token at the time the portlet is generating its content." (PLT.7.1)
  Because the whole navigational state (including request parameters) are now encoded 
in one Base64 encoded parameter, 
  it is NOT possible anymore to modify a created url anymore.

- Using HTTP GET as form method when using QueryStringEncodingPortalURL:
  The Portlet specification is explicit on HTTP GET

Re: Linux registry component test error

[Scott T. Weaver]

Randy,
It works for me on Mandrake running as a non-root user.  The issue I 
found is that the JDK likes to write some stuff back into its own 
directories when using the prefs api (bad idea IMO).  So what I had to 
do was give write access to the JDK directory of the user running the tests.

Randy Watler wrote:
This registry component tests error shows up on Linux/MySQL for the current
cvs version, (it apparently works on windows):
Testcase:
test1(org.apache.jetspeed.components.portletregistry.TestPortletRegistryDAO)
: Caused an ERROR
Could not lockSystem prefs.Lock file access denied.
java.lang.SecurityException: Could not lockSystem prefs.Lock file access
denied.
   at
java.util.prefs.FileSystemPreferences.checkLockFile0ErrorCode(FileSystemPref
erences.java:919)
   at
java.util.prefs.FileSystemPreferences.lockFile(FileSystemPreferences.java:90
8)
   at
java.util.prefs.FileSystemPreferences.removeNode(FileSystemPreferences.java:
656)
   at
org.apache.jetspeed.components.portletregistry.PersistenceStorePortletRegist
ry.removeApplication(PersistenceStorePortletRegistry.java:203)
   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
   at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39
)
   at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl
.java:25)
   at
org.springframework.aop.framework.AopProxyUtils.invokeJoinpointUsingReflecti
on(AopProxyUtils.java:61)
   at
org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint
(ReflectiveMethodInvocation.java:149)
   at
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(Reflect
iveMethodInvocation.java:116)
   at
org.springframework.transaction.interceptor.TransactionInterceptor.invoke(Tr
ansactionInterceptor.java:56)
   at
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(Reflect
iveMethodInvocation.java:138)
   at
org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopPro
xy.java:152)
   at $Proxy0.removeApplication(Unknown Source)
   at
org.apache.jetspeed.components.portletregistry.TestPortletRegistryDAO.tearDo
wn(TestPortletRegistryDAO.java:87)
Testcase:
testData(org.apache.jetspeed.components.portletregistry.TestPortletRegistryD
AO):  Caused an ERROR
Could not lockSystem prefs.Lock file access denied.
java.lang.SecurityException: Could not lockSystem prefs.Lock file access
denied.
   at
java.util.prefs.FileSystemPreferences.checkLockFile0ErrorCode(FileSystemPref
erences.java:919)
   at
java.util.prefs.FileSystemPreferences.lockFile(FileSystemPreferences.java:90
8)
   at
java.util.prefs.FileSystemPreferences.removeNode(FileSystemPreferences.java:
656)
   at
org.apache.jetspeed.components.portletregistry.PersistenceStorePortletRegist
ry.removeApplication(PersistenceStorePortletRegistry.java:203)
   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
   at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39
)
   at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl
.java:25)
   at
org.springframework.aop.framework.AopProxyUtils.invokeJoinpointUsingReflecti
on(AopProxyUtils.java:61)
   at
org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint
(ReflectiveMethodInvocation.java:149)
   at
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(Reflect
iveMethodInvocation.java:116)
   at
org.springframework.transaction.interceptor.TransactionInterceptor.invoke(Tr
ansactionInterceptor.java:56)
   at
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(Reflect
iveMethodInvocation.java:138)
   at
org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopPro
xy.java:152)
   at $Proxy0.removeApplication(Unknown Source)
   at
org.apache.jetspeed.components.portletregistry.TestPortletRegistryDAO.tearDo
wn(TestPortletRegistryDAO.java:87)
 


--
"Great minds discuss ideas. Average minds discuss events. Small minds discuss people." 
 - Admiral Hyman Rickover
***
*   Scott T. Weaver   *
* <[EMAIL PROTECTED]> *
* *
* --  *
*   Apache Jetspeed Enterprise Portal *
* Apache Pluto Portlet Container  *
* *
* OpenEditPro, Website Content Management *
*    *
***
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl JetspeedProfiler.java

[ate]

ate 2004/10/15 11:50:44

  Modified:components/profiler/src/java/org/apache/jetspeed/profiler/impl
JetspeedProfiler.java
  Log:
  Fixed ClassCastException thrown from Oracle jdbc driver which doesn't do automatic 
object.toString()
  when it gets passed in a complex object as filter parameter related to a character 
field.
  In general, one shouldn't rely on this kind of support.
  Although several jdbc drivers can handle it,  the Oracle jdbc driver certainly 
doesn't.
  
  Revision  ChangesPath
  1.9   +2 -2  
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfiler.java
  
  Index: JetspeedProfiler.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfiler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JetspeedProfiler.java 15 Oct 2004 06:59:21 -  1.8
  +++ JetspeedProfiler.java 15 Oct 2004 18:50:44 -  1.9
  @@ -358,7 +358,7 @@
   public String[] getLocatorNamesForPrincipal(Principal principal)
   {
   Filter filter = persistentStore.newFilter();
  -filter.addEqualTo("principalName", principal);
  +filter.addEqualTo("principalName", principal.getName());
   Object query = persistentStore.newQuery(principalRuleClass, filter);
   Collection result = persistentStore.getCollectionByQuery(query);
   if (result.size() == 0)
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Linux registry component test error

[Randy Watler]

This registry component tests error shows up on Linux/MySQL for the current
cvs version, (it apparently works on windows):

Testcase:
test1(org.apache.jetspeed.components.portletregistry.TestPortletRegistryDAO)
: Caused an ERROR
Could not lockSystem prefs.Lock file access denied.
java.lang.SecurityException: Could not lockSystem prefs.Lock file access
denied.
at
java.util.prefs.FileSystemPreferences.checkLockFile0ErrorCode(FileSystemPref
erences.java:919)
at
java.util.prefs.FileSystemPreferences.lockFile(FileSystemPreferences.java:90
8)
at
java.util.prefs.FileSystemPreferences.removeNode(FileSystemPreferences.java:
656)
at
org.apache.jetspeed.components.portletregistry.PersistenceStorePortletRegist
ry.removeApplication(PersistenceStorePortletRegistry.java:203)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39
)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl
.java:25)
at
org.springframework.aop.framework.AopProxyUtils.invokeJoinpointUsingReflecti
on(AopProxyUtils.java:61)
at
org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint
(ReflectiveMethodInvocation.java:149)
at
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(Reflect
iveMethodInvocation.java:116)
at
org.springframework.transaction.interceptor.TransactionInterceptor.invoke(Tr
ansactionInterceptor.java:56)
at
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(Reflect
iveMethodInvocation.java:138)
at
org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopPro
xy.java:152)
at $Proxy0.removeApplication(Unknown Source)
at
org.apache.jetspeed.components.portletregistry.TestPortletRegistryDAO.tearDo
wn(TestPortletRegistryDAO.java:87)

Testcase:
testData(org.apache.jetspeed.components.portletregistry.TestPortletRegistryD
AO):  Caused an ERROR
Could not lockSystem prefs.Lock file access denied.
java.lang.SecurityException: Could not lockSystem prefs.Lock file access
denied.
at
java.util.prefs.FileSystemPreferences.checkLockFile0ErrorCode(FileSystemPref
erences.java:919)
at
java.util.prefs.FileSystemPreferences.lockFile(FileSystemPreferences.java:90
8)
at
java.util.prefs.FileSystemPreferences.removeNode(FileSystemPreferences.java:
656)
at
org.apache.jetspeed.components.portletregistry.PersistenceStorePortletRegist
ry.removeApplication(PersistenceStorePortletRegistry.java:203)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39
)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl
.java:25)
at
org.springframework.aop.framework.AopProxyUtils.invokeJoinpointUsingReflecti
on(AopProxyUtils.java:61)
at
org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint
(ReflectiveMethodInvocation.java:149)
at
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(Reflect
iveMethodInvocation.java:116)
at
org.springframework.transaction.interceptor.TransactionInterceptor.invoke(Tr
ansactionInterceptor.java:56)
at
org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(Reflect
iveMethodInvocation.java:138)
at
org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopPro
xy.java:152)
at $Proxy0.removeApplication(Unknown Source)
at
org.apache.jetspeed.components.portletregistry.TestPortletRegistryDAO.tearDo
wn(TestPortletRegistryDAO.java:87)

cvs commit: jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam PortletApplicationDetail.java

[jford]

jford   2004/10/15 11:44:57

  Modified:applications/pam/src/java/org/apache/jetspeed/portlets/pam
PortletApplicationDetail.java
  Log:
  Initial code for extracting xml from OM.  This could be moved into a more common 
area however.
  
  Revision  ChangesPath
  1.33  +212 -1
jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.java
  
  Index: PortletApplicationDetail.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- PortletApplicationDetail.java 6 Oct 2004 23:45:05 -   1.32
  +++ PortletApplicationDetail.java 15 Oct 2004 18:44:56 -  1.33
  @@ -19,6 +19,7 @@
   
   import java.io.IOException;
   import java.util.ArrayList;
  +import java.util.Collection;
   import java.util.Iterator;
   import java.util.LinkedHashMap;
   import java.util.Locale;
  @@ -29,6 +30,7 @@
   import javax.portlet.PortletConfig;
   import javax.portlet.PortletContext;
   import javax.portlet.PortletException;
  +import javax.portlet.PortletMode;
   import javax.portlet.PortletSession;
   import javax.portlet.RenderRequest;
   import javax.portlet.RenderResponse;
  @@ -48,6 +50,7 @@
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
   import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
   import org.apache.jetspeed.om.common.preference.PreferenceComposite;
  +import org.apache.pluto.om.common.DescriptionSet;
   import org.apache.pluto.om.common.SecurityRoleRef;
   import org.apache.pluto.om.portlet.ContentType;
   import org.apache.portals.bridges.common.GenericServletPortlet;
  @@ -1065,6 +1068,214 @@
   registry.getPersistenceStore().getTransaction().commit();
   }
   }
  +}
  +
  +private String createXml(MutablePortletApplication pa)
  +{
  +StringBuffer buffer = new StringBuffer();
  +
  +buffer.append("");
  +
  +//TODO:  add namespace
  +buffer.append("\n");
  +
  +Iterator portletDefsIter = pa.getPortletDefinitions().iterator();
  +while (portletDefsIter.hasNext())
  +{
  +PortletDefinitionComposite pDef = (PortletDefinitionComposite) 
portletDefsIter.next();
  +buffer.append(createPortletDefinitionXml(pDef));
  +}
  +
  +buffer.append("\n");
  +
  +return buffer.toString();
  +}
  +
  +private String createPortletDefinitionXml(PortletDefinitionComposite pDef)
  +{
  +StringBuffer buffer = new StringBuffer();
  +
  +buffer.append("\n");
  +
  +Iterator paramIter = pDef.getInitParameterSet().iterator();
  +while (paramIter.hasNext())
  +{
  +ParameterComposite param = (ParameterComposite) paramIter.next();
  +buffer.append("\n");
  +
  +addDescriptions(buffer, param.getDescriptionSet());
  +
  +buffer.append("\t");
  +buffer.append(param.getName());
  +buffer.append("\n");
  +buffer.append("\t");
  +buffer.append(param.getValue());
  +buffer.append("\n");
  +buffer.append("\n");
  +}
  +
  +buffer.append("\t");
  +buffer.append(pDef.getName());
  +buffer.append("\n");
  +
  +Iterator displayNameIter = pDef.getDisplayNameSet().iterator();
  +while (displayNameIter.hasNext())
  +{
  +MutableDisplayName displayName = (MutableDisplayName) 
displayNameIter.next();
  +buffer.append("\t");
  +buffer.append(displayName.getDisplayName());
  +buffer.append("\n");
  +}
  +
  +addDescriptions(buffer, pDef.getDescriptionSet());
  +
  +buffer.append("\t");
  +buffer.append(pDef.getClassName());
  +buffer.append("\n");
  +
  +buffer.append("\t");
  +buffer.append(pDef.getExpirationCache());
  +buffer.append("\n");
  +
  +
  +Iterator contentTypeIter = pDef.getContentTypeSet().iterator();
  +while (contentTypeIter.hasNext())
  +{
  +buffer.append("\t\n");
  +ContentType contentType = (ContentType) contentTypeIter.next();
  +buffer.append("\t\t\n");
  +buffer.append(contentType.getContentType());
  +buffer.append("\n");
  +
  +Iterator modeIter = contentType.getPortletModes();
  +while (modeIter.hasNext())
  +{
  +PortletMode mode = (PortletMode) modeIter.next();
  +

cvs commit: jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl PortletDefinitionImpl.java

[jford]

jford   2004/10/15 11:44:18

  Modified:components/registry/src/java/org/apache/jetspeed/om/portlet/impl
PortletDefinitionImpl.java
  Log:
  Added getter methods for supported locales, resource bundle
  
  Revision  ChangesPath
  1.26  +6 -1  
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
  
  Index: PortletDefinitionImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- PortletDefinitionImpl.java12 Oct 2004 19:56:20 -  1.25
  +++ PortletDefinitionImpl.java15 Oct 2004 18:44:18 -  1.26
  @@ -868,6 +868,11 @@
   {
   resourceBundle = string;
   }
  +
  +public Collection getSupportedLocales()
  +{
  +return supportedLocales;
  +}
   
   public void addSupportedLocale(String locale)
   {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/om/common/portlet PortletDefinitionComposite.java

[jford]

jford   2004/10/15 11:44:04

  Modified:jetspeed-api/src/java/org/apache/jetspeed/om/common/portlet
PortletDefinitionComposite.java
  Log:
  Added getter methods for supported locales, resource bundle
  
  Revision  ChangesPath
  1.10  +5 -1  
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java
  
  Index: PortletDefinitionComposite.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PortletDefinitionComposite.java   6 Oct 2004 16:37:40 -   1.9
  +++ PortletDefinitionComposite.java   15 Oct 2004 18:44:04 -  1.10
  @@ -63,6 +63,10 @@
   void addContentType(String contentType, Collection modes);
   
   void setLanguageSet(LanguageSet languages);
  +
  +String getResourceBundle();
  +
  +Collection getSupportedLocales();
   
   /**
* The PreferenceSet is a collection user-defineable preferences
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Document Sets, MSSQL populate, and ProfiledPageContext caching.

[Scott T. Weaver]

Randy Watler wrote:
Scott,
David committed my last round of patches last night.
There is a prototype implementation of Document Sets that I hope can support
your needs for pull down list generation. There are examples checked in, but
please feel free to ask questions here whenever you get to looking at it.
For now, the Document Sets appear under the "Additional Links" in the left
menu table.
 

I saw that.  Great work!  I should have time to look at it later today.
The MSSQL populate script now uses 0/1 instead of true/false for BIT data
types as we dscussed.
 

Sounds good.
Lastly, I have added LRU caching to the ProfiledPageContext generation in
CastorXmlPageManager. The cost of generating all of the navigational data is
getting significant. The size of the cache is specified in the spring bean
configuration for the PageManager. One item is left to do with this: I need
to evict/expire/dump cached ProfiledPageContext information whenever a
document of folder changes under the pages directory. You mentioned
something about a listener I could tap into... what was it again and where
are they registered?
 

Look at the CastorFileSystemDocumentHandler in the contructor, you will 
see it adding itself to the FileCache that is passed in as a 
FileCacheEventListener.

Randy
 


--
"Great minds discuss ideas. Average minds discuss events. Small minds discuss people." 
 - Admiral Hyman Rickover
***
*   Scott T. Weaver   *
* <[EMAIL PROTECTED]> *
* *
* --  *
*   Apache Jetspeed Enterprise Portal *
* Apache Pluto Portlet Container  *
* *
* OpenEditPro, Website Content Management *
*    *
***
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Document Sets, MSSQL populate, and ProfiledPageContext caching.

[Randy Watler]

Scott,

David committed my last round of patches last night.

There is a prototype implementation of Document Sets that I hope can support
your needs for pull down list generation. There are examples checked in, but
please feel free to ask questions here whenever you get to looking at it.
For now, the Document Sets appear under the "Additional Links" in the left
menu table.

The MSSQL populate script now uses 0/1 instead of true/false for BIT data
types as we dscussed.

Lastly, I have added LRU caching to the ProfiledPageContext generation in
CastorXmlPageManager. The cost of generating all of the navigational data is
getting significant. The size of the cache is specified in the spring bean
configuration for the PageManager. One item is left to do with this: I need
to evict/expire/dump cached ProfiledPageContext information whenever a
document of folder changes under the pages directory. You mentioned
something about a listener I could tap into... what was it again and where
are they registered?

Randy

Decorators and Navigation Templates

[Randy Watler]

Gang,

As of today, we have rolled a J2 based corporate portal into production and
it is live. Due to the demands of our marketing and graphics design folk, I
had to generate complete Decorators from the ground up. In the end, I was
unable to use the default Navigation Templates due to the highly customized
nature of our portal interface. I simply rolled the templates inline into
the Decorators instead of customizing the Jetspeed Navigation Templates. I
took this route because, as I understand it, Decorators are to be deployable
as a unit and I felt that I was better served if I made our custom
Decorators stand alone. Additionally, I did not have to solve the locale
issues for our portal, so I did not need to consider shifting "LeftToRight"
to "TopToBottom" dynamically.

I spoke with David about this and he urged me to post this to the dev list
to open up the discussion of dependencies between Decorators and Navigation
Templates. Based only on my limited exposure to J2, I can throw in a few
options to start the discussion:

1 - Make Templates and Decorators deployable in the final version of the
product. This does not eliminate cross dependencies, but does open up all
templates for customization.
2 - Add Navigation Template support within Decorators. This would allow
Decorators to stand alone, but might need some kind of fallback mechanism
across decorators to promote reuse.
3 - Implement both 1, (to allow deploment of all Templates and provide
Navigation Template defaults), and 2, (to allow customization of templates
on a per-decorator basis and a stable packaging option for those that
require it). However, this might be just too complex to be worth it.

Thoughts?

Randy

Re: Test suite page portlets throwing error

[Anshu Dureja]

Thanks Scott

"Scott T. Weaver" <[EMAIL PROTECTED]> wrote:The testsuite portlets along with the 
party portlet are not included 
with J2. You will to deploy these yourslef. I think you can build the 
testsuite portlets from the pluto code base, as for thethrid party 
portlets, they are available from sourceforge: 
http://sourceforge.net/projects/portlet-opensrc/

Regards,

Anshu Dureja wrote:

>Hello All,
> I have installed and setup jetspeed-2 on tomcat 5.0.28 and using jdk1.4.2_03, its 
> running fine but some portlets(third party portlets,test page suite,my first psml 
> page) are throwing error like test suite page portlet is throwing the following 
> error and others two also have the same issue--
> 
>Test suite page 
>portlets--
> org.apache.jetspeed.container.window.FailedToRetrievePortletWindow: 
> org.apache.jetspeed.container.window.FailedToCreateWindowException: Error generating 
> new PortletEntity: 
> org.apache.jetspeed.components.portletentity.PortletEntityNotGeneratedException: 
> Failed to retrieve Portlet Definition for PAM::PortletApplicationBrowser
> at 
> org.apache.jetspeed.container.window.impl.PortletWindowAccessorImpl.getPortletWindow(PortletWindowAccessorImpl.java:100)
> at 
> org.apache.jetspeed.velocity.JetspeedPowerTool.getCurrentPortletEntity(JetspeedPowerTool.java:384)
> at sun.reflect.GeneratedMethodAccessor131.invoke(Unknown Source)
> at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:324)
> at 
> org.apache.velocity.runtime.parser.node.PropertyExecutor.execute(PropertyExecutor.java:111)
> at 
> org.apache.velocity.util.introspection.UberspectImpl$VelGetterImpl.invoke(UberspectImpl.java:302)
> at 
> org.apache.velocity.runtime.parser.node.ASTIdentifier.execute(ASTIdentifier.java:157)
> at 
> org.apache.velocity.runtime.parser.node.ASTReference.execute(ASTReference.java:175)
> at org.apache.velocity.runtime.parser.node.ASTReference.value(ASTReference.java:327)
> at org.apache.velocity.runtime.parser.node.ASTExpression.value(ASTExpression.java:51)
> at 
> org.apache.velocity.runtime.parser.node.ASTSetDirective.render(ASTSetDirective.java:95)
> at org.apache.velocity.runtime.parser.node.SimpleNode.render(SimpleNode.java:230)
> at org.apache.velocity.Template.merge(Template.java:256)
> at 
> org.apache.jetspeed.velocity.JetspeedVelocityViewServlet.mergeTemplate(JetspeedVelocityViewServlet.java:116)
> at 
> org.apache.velocity.tools.view.servlet.VelocityViewServlet.doRequest(VelocityViewServlet.java:455)
> at 
> org.apache.velocity.tools.view.servlet.VelocityViewServlet.doGet(VelocityViewServlet.java:411)
> at javax.servlet.http.HttpServlet.service(HttpServlet.java:689)
> at javax.servlet.http.HttpServlet.service(HttpServlet.java:802)
> at 
> org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:237)
> at 
> org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:157)
> at 
> org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:704)
> at 
> org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:590)
> at 
> org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:510)
> at 
> org.apache.jetspeed.dispatcher.JetspeedRequestDispatcher.include(JetspeedRequestDispatcher.java:65)
> at 
> org.apache.jetspeed.velocity.JetspeedPowerTool.decorateAndIncludePortlet(JetspeedPowerTool.java:774)
> at 
> org.apache.jetspeed.velocity.JetspeedPowerTool.decorateAndInclude(JetspeedPowerTool.java:661)
> at sun.reflect.GeneratedMethodAccessor130.invoke(Unknown Source)
> at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:324)
> at 
> org.apache.velocity.util.introspection.UberspectImpl$VelMethodImpl.invoke(UberspectImpl.java:267)
> at org.apache.velocity.runtime.parser.node.ASTMethod.execute(ASTMethod.java:197)
> at 
> org.apache.velocity.runtime.parser.node.ASTReference.execute(ASTReference.java:175)
> at org.apache.velocity.runtime.parser.node.ASTReference.render(ASTReference.java:220)
> at org.apache.velocity.runtime.parser.node.ASTBlock.render(ASTBlock.java:55)
> at org.apache.velocity.runtime.directive.Foreach.render(Foreach.java:166)
> at org.apache.velocity.runtime.parser.node.ASTDirective.render(ASTDirective.java:114)
> at org.apache.velocity.runtime.parser.node.ASTBlock.render(ASTBlock.java:55)
> at org.apache.velocity.runtime.directive.Foreach.render(Foreach.java:166)
> at org.apache.velocity.runtime.parser.node.ASTDirective.render(ASTDirective.java:114)
> at org.apache.velocity.runtime.parser.node.SimpleNode.render(SimpleNode.java:230)
> at org.apache.velocity.Template.merge(Template.java:256)
> at 
> org.apache.jetspeed.velocity.JetspeedVelocityViewServlet.mergeTemplate(JetspeedVeloc

cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative user-admin.ds

[taylor]

taylor  2004/10/15 09:27:28

  Modified:portal/src/webapp/WEB-INF/pages/Administrative user-admin.ds
  Log:
  *** keyword substitution change ***
  
  Revision  ChangesPath
  1.2   +6 -7  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/user-admin.ds
  
  Index: user-admin.ds
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/user-admin.ds,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- user-admin.ds 15 Oct 2004 07:00:18 -  1.1
  +++ user-admin.ds 15 Oct 2004 16:27:28 -  1.2
  @@ -1,7 +1,6 @@
  -

  -

  -  Users Admin Pages

  -  user-admin

  -  /Administrative/user-mgt.psml

  -  /Administrative/users-jsf.psml

  -

  +
  +
  +  Users Admin Pages
  +  user-admin
  +  /Administrative/user-mgt.psml
  +
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/manager default-page.psml

[taylor]

taylor  2004/10/15 09:13:42

  Modified:portal/src/webapp/WEB-INF/pages/_role/manager
default-page.psml
  Log:
  unique the ids
  
  Revision  ChangesPath
  1.2   +3 -3  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/manager/default-page.psml
  
  Index: default-page.psml
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/manager/default-page.psml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- default-page.psml 23 Sep 2004 19:56:13 -  1.1
  +++ default-page.psml 15 Oct 2004 16:13:42 -  1.2
  @@ -21,12 +21,12 @@
portlet-decorator="jetspeed"
 />
 Manager Role Page
  -  
  -
  +  
  +
 
 
   
  -
  +
 
 
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Test suite page portlets throwing error

[Scott T. Weaver]

The testsuite portlets along with the party portlet are not included 
with J2.  You will to deploy these yourslef.  I think you can build the 
testsuite portlets from the pluto code base, as for thethrid party 
portlets, they are available from sourceforge: 
http://sourceforge.net/projects/portlet-opensrc/

Regards,
Anshu Dureja wrote:
Hello All,
 I have installed and setup jetspeed-2 on tomcat 5.0.28 and using jdk1.4.2_03, its 
running fine but some portlets(third party portlets,test page suite,my first psml 
page) are throwing error like test suite page portlet is throwing the following error 
and others two also have the same issue--
Test suite page 
portlets--
org.apache.jetspeed.container.window.FailedToRetrievePortletWindow: 
org.apache.jetspeed.container.window.FailedToCreateWindowException: Error generating 
new PortletEntity: 
org.apache.jetspeed.components.portletentity.PortletEntityNotGeneratedException: 
Failed to retrieve Portlet Definition for PAM::PortletApplicationBrowser
at 
org.apache.jetspeed.container.window.impl.PortletWindowAccessorImpl.getPortletWindow(PortletWindowAccessorImpl.java:100)
at 
org.apache.jetspeed.velocity.JetspeedPowerTool.getCurrentPortletEntity(JetspeedPowerTool.java:384)
at sun.reflect.GeneratedMethodAccessor131.invoke(Unknown Source)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:324)
at 
org.apache.velocity.runtime.parser.node.PropertyExecutor.execute(PropertyExecutor.java:111)
at 
org.apache.velocity.util.introspection.UberspectImpl$VelGetterImpl.invoke(UberspectImpl.java:302)
at 
org.apache.velocity.runtime.parser.node.ASTIdentifier.execute(ASTIdentifier.java:157)
at org.apache.velocity.runtime.parser.node.ASTReference.execute(ASTReference.java:175)
at org.apache.velocity.runtime.parser.node.ASTReference.value(ASTReference.java:327)
at org.apache.velocity.runtime.parser.node.ASTExpression.value(ASTExpression.java:51)
at 
org.apache.velocity.runtime.parser.node.ASTSetDirective.render(ASTSetDirective.java:95)
at org.apache.velocity.runtime.parser.node.SimpleNode.render(SimpleNode.java:230)
at org.apache.velocity.Template.merge(Template.java:256)
at 
org.apache.jetspeed.velocity.JetspeedVelocityViewServlet.mergeTemplate(JetspeedVelocityViewServlet.java:116)
at 
org.apache.velocity.tools.view.servlet.VelocityViewServlet.doRequest(VelocityViewServlet.java:455)
at 
org.apache.velocity.tools.view.servlet.VelocityViewServlet.doGet(VelocityViewServlet.java:411)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:689)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:802)
at 
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:237)
at 
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:157)
at 
org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:704)
at 
org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:590)
at 
org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:510)
at 
org.apache.jetspeed.dispatcher.JetspeedRequestDispatcher.include(JetspeedRequestDispatcher.java:65)
at 
org.apache.jetspeed.velocity.JetspeedPowerTool.decorateAndIncludePortlet(JetspeedPowerTool.java:774)
at 
org.apache.jetspeed.velocity.JetspeedPowerTool.decorateAndInclude(JetspeedPowerTool.java:661)
at sun.reflect.GeneratedMethodAccessor130.invoke(Unknown Source)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:324)
at 
org.apache.velocity.util.introspection.UberspectImpl$VelMethodImpl.invoke(UberspectImpl.java:267)
at org.apache.velocity.runtime.parser.node.ASTMethod.execute(ASTMethod.java:197)
at org.apache.velocity.runtime.parser.node.ASTReference.execute(ASTReference.java:175)
at org.apache.velocity.runtime.parser.node.ASTReference.render(ASTReference.java:220)
at org.apache.velocity.runtime.parser.node.ASTBlock.render(ASTBlock.java:55)
at org.apache.velocity.runtime.directive.Foreach.render(Foreach.java:166)
at org.apache.velocity.runtime.parser.node.ASTDirective.render(ASTDirective.java:114)
at org.apache.velocity.runtime.parser.node.ASTBlock.render(ASTBlock.java:55)
at org.apache.velocity.runtime.directive.Foreach.render(Foreach.java:166)
at org.apache.velocity.runtime.parser.node.ASTDirective.render(ASTDirective.java:114)
at org.apache.velocity.runtime.parser.node.SimpleNode.render(SimpleNode.java:230)
at org.apache.velocity.Template.merge(Template.java:256)
at 
org.apache.jetspeed.velocity.JetspeedVelocityViewServlet.mergeTemplate(JetspeedVelocityViewServlet.java:116)
at 
org.apache.velocity.tools.view.servlet.VelocityViewServlet.doRequest(VelocityViewServlet.java:455)
at 
org.apache.velocity.tools.view.servlet.VelocityViewServlet.doGet(VelocityVie

Test suite page portlets throwing error

[Anshu Dureja]

Hello All,
  I have installed and setup jetspeed-2 on tomcat 5.0.28 and using jdk1.4.2_03, 
its running fine but some portlets(third party portlets,test page suite,my first psml 
page) are throwing error like test suite page portlet is throwing the following error 
and others two also have the same issue--
 
Test suite page 
portlets--
 org.apache.jetspeed.container.window.FailedToRetrievePortletWindow: 
org.apache.jetspeed.container.window.FailedToCreateWindowException: Error generating 
new PortletEntity: 
org.apache.jetspeed.components.portletentity.PortletEntityNotGeneratedException: 
Failed to retrieve Portlet Definition for PAM::PortletApplicationBrowser
 at 
org.apache.jetspeed.container.window.impl.PortletWindowAccessorImpl.getPortletWindow(PortletWindowAccessorImpl.java:100)
 at 
org.apache.jetspeed.velocity.JetspeedPowerTool.getCurrentPortletEntity(JetspeedPowerTool.java:384)
 at sun.reflect.GeneratedMethodAccessor131.invoke(Unknown Source)
 at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
 at java.lang.reflect.Method.invoke(Method.java:324)
 at 
org.apache.velocity.runtime.parser.node.PropertyExecutor.execute(PropertyExecutor.java:111)
 at 
org.apache.velocity.util.introspection.UberspectImpl$VelGetterImpl.invoke(UberspectImpl.java:302)
 at 
org.apache.velocity.runtime.parser.node.ASTIdentifier.execute(ASTIdentifier.java:157)
 at org.apache.velocity.runtime.parser.node.ASTReference.execute(ASTReference.java:175)
 at org.apache.velocity.runtime.parser.node.ASTReference.value(ASTReference.java:327)
 at org.apache.velocity.runtime.parser.node.ASTExpression.value(ASTExpression.java:51)
 at 
org.apache.velocity.runtime.parser.node.ASTSetDirective.render(ASTSetDirective.java:95)
 at org.apache.velocity.runtime.parser.node.SimpleNode.render(SimpleNode.java:230)
 at org.apache.velocity.Template.merge(Template.java:256)
 at 
org.apache.jetspeed.velocity.JetspeedVelocityViewServlet.mergeTemplate(JetspeedVelocityViewServlet.java:116)
 at 
org.apache.velocity.tools.view.servlet.VelocityViewServlet.doRequest(VelocityViewServlet.java:455)
 at 
org.apache.velocity.tools.view.servlet.VelocityViewServlet.doGet(VelocityViewServlet.java:411)
 at javax.servlet.http.HttpServlet.service(HttpServlet.java:689)
 at javax.servlet.http.HttpServlet.service(HttpServlet.java:802)
 at 
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:237)
 at 
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:157)
 at 
org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:704)
 at 
org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:590)
 at 
org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:510)
 at 
org.apache.jetspeed.dispatcher.JetspeedRequestDispatcher.include(JetspeedRequestDispatcher.java:65)
 at 
org.apache.jetspeed.velocity.JetspeedPowerTool.decorateAndIncludePortlet(JetspeedPowerTool.java:774)
 at 
org.apache.jetspeed.velocity.JetspeedPowerTool.decorateAndInclude(JetspeedPowerTool.java:661)
 at sun.reflect.GeneratedMethodAccessor130.invoke(Unknown Source)
 at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
 at java.lang.reflect.Method.invoke(Method.java:324)
 at 
org.apache.velocity.util.introspection.UberspectImpl$VelMethodImpl.invoke(UberspectImpl.java:267)
 at org.apache.velocity.runtime.parser.node.ASTMethod.execute(ASTMethod.java:197)
 at org.apache.velocity.runtime.parser.node.ASTReference.execute(ASTReference.java:175)
 at org.apache.velocity.runtime.parser.node.ASTReference.render(ASTReference.java:220)
 at org.apache.velocity.runtime.parser.node.ASTBlock.render(ASTBlock.java:55)
 at org.apache.velocity.runtime.directive.Foreach.render(Foreach.java:166)
 at org.apache.velocity.runtime.parser.node.ASTDirective.render(ASTDirective.java:114)
 at org.apache.velocity.runtime.parser.node.ASTBlock.render(ASTBlock.java:55)
 at org.apache.velocity.runtime.directive.Foreach.render(Foreach.java:166)
 at org.apache.velocity.runtime.parser.node.ASTDirective.render(ASTDirective.java:114)
 at org.apache.velocity.runtime.parser.node.SimpleNode.render(SimpleNode.java:230)
 at org.apache.velocity.Template.merge(Template.java:256)
 at 
org.apache.jetspeed.velocity.JetspeedVelocityViewServlet.mergeTemplate(JetspeedVelocityViewServlet.java:116)
 at 
org.apache.velocity.tools.view.servlet.VelocityViewServlet.doRequest(VelocityViewServlet.java:455)
 at 
org.apache.velocity.tools.view.servlet.VelocityViewServlet.doGet(VelocityViewServlet.java:411)
 at javax.servlet.http.HttpServlet.service(HttpServlet.java:689)
 at javax.servlet.http.HttpServlet.service(HttpServlet.java:802)
 at 
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:237)
 at 
org.apache.catalina.core.Applica

cvs commit: jakarta-jetspeed-2 .classpath

[weaver]

weaver  2004/10/15 08:04:08

  Modified:..classpath
  Log:
  upgraded to commons-collections 3.0
  
  Revision  ChangesPath
  1.68  +1 -1  jakarta-jetspeed-2/.classpath
  
  Index: .classpath
  ===
  RCS file: /home/cvs/jakarta-jetspeed-2/.classpath,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- .classpath13 Oct 2004 20:01:43 -  1.67
  +++ .classpath15 Oct 2004 15:04:07 -  1.68
  @@ -67,7 +67,7 @@



  - 
  + 



  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Tomcat 5-jetspeed2 error

[Anshu Dureja]

Thanks a lot ... now i have jetspeed-2 up and running.

Jaq Marit <[EMAIL PROTECTED]> wrote:See the previous posts. You might need to upgrade 
your j2sdk. Also see
http://wiki.apache.org/portals/Jetspeed2/PrefsClassloaderIssuesAndSdk14

Quoting Anshu Dureja :

> sorry i forgot to mention the version of tomcat its tomcat 5.0.28
> 
> Thanks
> Anshu
> 
> Anshu Dureja wrote:
> I have followed all the steps to install and setup jetspeed-2
> (getting-started.html) on tomcat5 and i didn't get any error in build but now
> during tomcat startup i am getting the following error
> "Error creating bean with name
> 'org.apache.jetspeed.prefs.PreferencesProvider' :Can't instantiate
> Preferences factory java.lang.ClassNotFoundException:
> org.apache.jetspeed.prefs.impl.Preferences"
> 
> I don't know if i am doing something wrong.
> 
> Can somebody tell me the reason of this error?
> 
> I am using the default hypersonic database.
> 
> Please help me...i have to evaluate jetspeed so that we can start using it
> for our company's portal.
> 
> 
> Thanks 
> Anshu Dureja
> 
> 
> 
> 
> 
> 
> 
> [EMAIL PROTECTED] wrote:
> The following comment has been added to this issue:
> 
> Author: Scott T Weaver
> Created: Thu, 14 Oct 2004 8:21 AM
> Body:
> +1 on requiring tomcat 5.0.28+
> -
> View this comment:
> http://issues.apache.org/jira/browse/JS2-55?page=comments#action_54046
> 
> -
> View the issue:
> http://issues.apache.org/jira/browse/JS2-55
> 
> Here is an overview of the issue:
> -
> Key: JS2-55
> Summary: JAAS Authentication on Tomcat 5
> Type: New Feature
> 
> Status: Unassigned
> Priority: Major
> 
> Project: Jetspeed 2
> Components: 
> Security
> Versions:
> 2.0-a1
> 
> Assignee: 
> Reporter: Ate Douma
> 
> Created: Tue, 25 May 2004 3:26 PM
> Updated: Thu, 14 Oct 2004 8:21 AM
> Environment: Tomcat 5.0.24, J2SE 1.4.2_03
> 
> Description:
> As discussed on the Jetspeed developers mailinglist (thread starts with:
>
http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]&msgNo=14605)
> the new behaviour of Tomcat 5 to set the ContextClassLoader in the JAASRealm
> to the server classloader prevents defining LoginModules within the context
> of an web app.
> 
> As a quick solution to this problem the Tomcat 5 JAASRealm is going to be
> patched to revert back to the old Tomcat 4 handling.
> 
> The preferred solution is that the Tomcat Team would do this themselves or
> provide it as an option. Someone should start discussing this with them
> 
> I'll provide a patch implementing the quick fix which will depend on the user
> property catalina.version.major=5 to be enforced upon the catalina server:
> when this condition is true a patched version of the Tomcat 5.0.24
> JAASRealm.java revision 1.6 will be compiled into the $Tomcat/server/classes
> directory.
> 
> 
> -
> JIRA INFORMATION:
> This message is automatically generated by JIRA.
> 
> If you think it was sent incorrectly contact one of the administrators:
> http://issues.apache.org/jira/secure/Administrators.jspa
> 
> If you want more information on JIRA, or have a bug to report see:
> http://www.atlassian.com/software/jira
> 
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
> 
> __
> Do You Yahoo!?
> Tired of spam? Yahoo! Mail has the best spam protection around 
> http://mail.yahoo.com 
> __
> Do You Yahoo!?
> Tired of spam? Yahoo! Mail has the best spam protection around 
> http://mail.yahoo.com 





This message was sent using IMP, the Internet Messaging Program.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]




-
Do you Yahoo!?
vote.yahoo.com - Register online to vote today!

cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/css styles.css

[taylor]

taylor  2004/10/15 00:02:10

  Modified:portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed
decorator-top.vm
   portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/css
styles.css
  Added:   portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/images
page.sm.png
  Log:
  docset support for default layouts, ugly page icon ;)
  patch from Randy Watler
  
  Revision  ChangesPath
  1.20  +23 -6 
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm
  
  Index: decorator-top.vm
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- decorator-top.vm  20 Sep 2004 19:29:21 -  1.19
  +++ decorator-top.vm  15 Oct 2004 07:02:10 -  1.20
  @@ -58,12 +58,29 @@

   
   
  - 
  - 
  -  Additional Links:
  -  #includeNavigation("linksWithIcon1" $profiledPageContext.rootLinks 
$TOP_TO_BOTTOM)
  - 
  - 
  +  
  +
  +#if($profiledPageContext.rootLinks)
  +
  +
  +Additional Links:
  +#includeNavigation("linksWithIcon1" $profiledPageContext.rootLinks 
$TOP_TO_BOTTOM)
  +  
  +
  +#end
  +#foreach($docSetName in $profiledPageContext.documentSetNames)
  +  #set($docSet = $profiledPageContext.getDocumentSet($docSetName))
  +  #set($docSetNodes = $profiledPageContext.getDocumentSetNodes($docSetName))
  +  
  +
  +  ${docSet.getTitle($preferedLocale)}:
  +  #includeNavigation("linksWithIcon1" $docSetNodes $TOP_TO_BOTTOM)
  +
  +  
  +#end
  +
  +  
  +  
 
   ## $jetspeed.include($jetspeed.currentFragment)
   
  
  
  
  1.1  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/images/page.sm.png
  
<>
  
  
  1.17  +28 -0 
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/css/styles.css
  
  Index: styles.css
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/css/styles.css,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- styles.css27 Sep 2004 17:50:20 -  1.16
  +++ styles.css15 Oct 2004 07:02:10 -  1.17
  @@ -83,6 +83,34 @@
   */
 margin-right:19px;  
   }
  +.LinkFolder
  +{
  +  background: url(content/images/folder.sm.png) no-repeat;
  +  padding-top: 5px;
  +  width: 100%;
  +  /** Padding is just a wee bit larger than our icons with */ 
  +  padding-left: 19px;
  +  
  +  /** Needed to offset the 19px padding on the left, 
  +* othewise we "bleed" into our neighboring element 
  +* on the right.
  +*/
  +  margin-right:19px;  
  +}
  +.LinkPage
  +{
  +  background: url(content/images/page.sm.png) no-repeat;
  +  padding-top: 5px;
  +  width: 100%;
  +  /** Padding is just a wee bit larger than our icons with */ 
  +  padding-left: 19px;
  +  
  +  /** Needed to offset the 19px padding on the left, 
  +* othewise we "bleed" into our neighboring element 
  +* on the right.
  +*/
  +  margin-right:19px;  
  +}
   
   .layout-Jetspeed .LTabLeftLow
   {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/mockobjects/request MockRequestContext.java

[taylor]

taylor  2004/10/15 00:07:50

  Modified:jetspeed-api/src/java/org/apache/jetspeed/profiler
ProfiledPageContext.java ProfileLocator.java
Profiler.java
   jetspeed-api/src/java/org/apache/jetspeed/page/document
NodeSet.java FolderHandler.java
   jetspeed-api/src/java/org/apache/jetspeed/request
RequestContext.java
   jetspeed-api/src/java/org/apache/jetspeed/page
PageManager.java
   jetspeed-api/src/java/org/apache/jetspeed/om/folder
Folder.java
   jetspeed-api/src/java/org/apache/jetspeed/mockobjects/request
MockRequestContext.java
  Added:   jetspeed-api/src/java/org/apache/jetspeed/om/folder
DocumentSet.java DocumentSetPath.java
  Log:
  patch from Randy Watler
  additions to the api to support 1 or more locators when profiling, and docset model
  
  Revision  ChangesPath
  1.2   +50 -6 
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfiledPageContext.java
  
  Index: ProfiledPageContext.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfiledPageContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProfiledPageContext.java  17 Sep 2004 20:06:53 -  1.1
  +++ ProfiledPageContext.java  15 Oct 2004 07:07:49 -  1.2
  @@ -15,6 +15,10 @@
*/
   package org.apache.jetspeed.profiler;
   
  +import java.util.Iterator;
  +import java.util.Map;
  +
  +import org.apache.jetspeed.om.folder.DocumentSet;
   import org.apache.jetspeed.om.folder.Folder;
   import org.apache.jetspeed.om.page.Page;
   import org.apache.jetspeed.page.document.NodeSet;
  @@ -33,16 +37,17 @@
* Initialize this page context.
*
* @param profiler The profiler initializing this page context.
  - * @param locator The profile locator used to create this page context.
  + * @param locators The map of profile locators by locator name
  + * used to create this page context.
*/
  -void init(Profiler profiler, ProfileLocator locator);
  +void init(Profiler profiler, Map locators);
   
   /**
  - * Return ProfileLocator used to generate this page context.
  + * Return Map of ProfileLocator instances used to generate this page context.
*  
  - * @return The ProfileLocator instance.
  + * @return The Map of ProfileLocator instances by locator name.
*/
  -ProfileLocator getLocator();
  +Map getLocators();
   
   /**
* Return profiled Page.
  @@ -141,4 +146,43 @@
* @param links The root Link set.
*/
   void setRootLinks(NodeSet links);
  +
  +/**
  + * Return profiled document set used for menu navigation. The
  + * returned value may or may not be equivalent to the result of
  + * accessing documents relative to other documents returned as part
  + * of this profiled context.
  + *  
  + * @param name The name of the document set.
  + * @return The document set.
  + */
  +DocumentSet getDocumentSet(String name);
  +
  +/**
  + * Return profiled document set used for menu navigation. This is
  + * a set of folders and documents defined by the document set
  + * related to the profiled page. The returned values may or may not
  + * be equivalent to the result of accessing documents relative to
  + * other documents returned as part of this profiled context.
  + *  
  + * @param name The name of the document set.
  + * @return The expanded document set nodes.
  + */
  +NodeSet getDocumentSetNodes(String name);
  +
  +/**
  + * Return profiled document set names.
  + *  
  + * @return An iterator over document set names.
  + */
  +Iterator getDocumentSetNames();
  +
  +/**
  + * Set a named document set and expanded nodes.
  + *  
  + * @param name The name of the document set.
  + * @param documentSet The document set.
  + * @param nodes The expanded document set nodes.
  + */
  +void setDocumentSet(String name, DocumentSet documentSet, NodeSet nodes);
   }
  
  
  
  1.5   +1 -9  
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java
  
  Index: ProfileLocator.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProfileLocator.java   8 Oct 2004 06:49:37 -   1.4
  +++ ProfileLocator.java   15 Oct 2004 07:07:49 -  1.5
  @@ -153,12 +1

cvs commit: jakarta-jetspeed-2/src/sql/mssql populate-userinfo-for-default-psml.sql

[taylor]

taylor  2004/10/15 00:06:48

  Modified:src/sql  populate-db-default.sql
  Added:   src/sql/mssql populate-userinfo-for-default-psml.sql
  Log:
  add MS SQL support to population scripts
  patch from Randy Watler
  
  Revision  ChangesPath
  1.6   +3 -3  jakarta-jetspeed-2/src/sql/populate-db-default.sql
  
  Index: populate-db-default.sql
  ===
  RCS file: /home/cvs/jakarta-jetspeed-2/src/sql/populate-db-default.sql,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- populate-db-default.sql   8 Oct 2004 06:49:37 -   1.5
  +++ populate-db-default.sql   15 Oct 2004 07:06:48 -  1.6
  @@ -307,6 +307,6 @@
   
   insert into PRINCIPAL_RULE_ASSOC values ( 'guest', 'page', 'j1' );
   insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'page', 'role-fallback' );
  -
  -
  -
  +insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'docset', 'role-group' );
  +insert into PRINCIPAL_RULE_ASSOC values ( 'user', 'page', 'j1' );
  +insert into PRINCIPAL_RULE_ASSOC values ( 'user', 'docset', 'role-group' );
  
  
  
  1.1  
jakarta-jetspeed-2/src/sql/mssql/populate-userinfo-for-default-psml.sql
  
  Index: populate-userinfo-for-default-psml.sql
  ===
  INSERT INTO PREFS_NODE VALUES(1,NULL,'',0,'/','2004-05-22 14:57:53.586','2004-05-22 
14:57:53.586');

  INSERT INTO PREFS_NODE VALUES(101,1,'user',0,'/user','2004-05-22 
16:27:12.472','2004-05-22 16:27:12.472');

  INSERT INTO PREFS_NODE VALUES(102,101,'admin',0,'/user/admin','2004-05-22 
16:27:12.482','2004-05-22 16:27:12.482');

  INSERT INTO PREFS_NODE 
VALUES(103,102,'userinfo',0,'/user/admin/userinfo','2004-05-22 
16:27:12.522','2004-05-22 16:27:12.532');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(1,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/admin','2004-05-22
 16:27:12.442','2004-05-22 16:27:12.442');

  INSERT INTO PREFS_PROPERTY_KEY VALUES(61,'user.name.given',3,'2004-05-22 
16:27:12.532','2004-05-22 16:27:12.532');

  INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,61,0,NULL,0,0.0E0,'Test 
Dude','2004-05-22 16:27:12.562','2004-05-22 16:27:12.562');

  INSERT INTO PREFS_PROPERTY_KEY VALUES(62,'user.name.family',3,'2004-05-22 
16:27:12.532','2004-05-22 16:27:12.532');

  INSERT INTO PREFS_PROPERTY_VALUE 
VALUES(42,103,62,0,NULL,0,0.0E0,'Dudley','2004-05-22 16:27:12.572','2004-05-22 
16:27:12.572');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(2,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/manager','2004-05-22
 16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/user','2004-05-22
 16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/tomcat','2004-05-22
 16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(5,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/jetspeed','2004-05-22
 16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(6,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl','/role/admin','2004-05-22
 16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(7,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl','/role/manager','2004-05-22
 16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(8,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl','/role/user','2004-05-22
 16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(9,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/guest','2004-05-22
 16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(10,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl','/role/guest','2004-05-22
 16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(11,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl','/group/accounting','2004-05-22
 16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(12,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl','/group/marketing','2004-05-22
 16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_PRINCIPAL 
VALUES(13,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl','/group/engineering','2004-05-22
 16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_CREDENTIAL 
VALUES(1,1,'admin',0,'org.apache.jetspeed.security.PasswordCredential','2004-05-22 
16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_CREDENTIAL 
VALUES(2,2,'manager',0,'org.apache.jetspeed.security.PasswordCredential','2004-05-22 
16:27:12.572','2004-05-22 16:27:12.572');

  INSERT INTO SECURITY_CREDENTIAL 
VALUES(3,3,'user',0,'org.apache.jetspeed.security.Pa

cvs commit: jakarta-jetspeed-2/src/sql/mssql - New directory

[taylor]

taylor  2004/10/15 00:06:47

  jakarta-jetspeed-2/src/sql/mssql - New directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request JetspeedRequestContext.java

[taylor]

taylor  2004/10/15 00:06:16

  Modified:portal/src/java/org/apache/jetspeed/request
JetspeedRequestContext.java
  Log:
  added support for 1 or more locators in the context
  
  Revision  ChangesPath
  1.33  +6 -7  
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java
  
  Index: JetspeedRequestContext.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- JetspeedRequestContext.java   11 Sep 2004 23:40:18 -  1.32
  +++ JetspeedRequestContext.java   15 Oct 2004 07:06:16 -  1.33
  @@ -39,7 +39,6 @@
   import org.apache.jetspeed.om.common.MutableLanguage;
   import org.apache.jetspeed.om.impl.LanguageImpl;
   import org.apache.jetspeed.om.page.Page;
  -import org.apache.jetspeed.profiler.ProfileLocator;
   import org.apache.jetspeed.userinfo.UserInfoManager;
   import org.apache.pluto.om.common.Language;
   import org.apache.pluto.om.common.LanguageSet;
  @@ -61,7 +60,7 @@
   private HttpServletRequest request;
   private HttpServletResponse response;
   private ServletConfig config;
  -private ProfileLocator locator;
  +private Map locators;
   private Page page;
   private PortletDefinition portletDefinition;
   private Subject subject;
  @@ -132,14 +131,14 @@
   return config;
   }
   
  -public ProfileLocator getProfileLocator()
  +public Map getProfileLocators()
   {
  -return locator;
  +return locators;
   }
   
  -public void setProfileLocator( ProfileLocator locator )
  +public void setProfileLocators( Map locators )
   {
  -this.locator = locator;
  +this.locators = locators;
   }
   
   public Page getPage()
  @@ -552,4 +551,4 @@
   {
   this.requestPath = path;
   }
  -}
  \ No newline at end of file
  +}
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl PageAggregatorImpl.java

[taylor]

taylor  2004/10/15 00:05:27

  Modified:portal/src/java/org/apache/jetspeed/aggregator/impl
PageAggregatorImpl.java
  Log:
  npe check
  
  Revision  ChangesPath
  1.14  +2 -2  
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
  
  Index: PageAggregatorImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- PageAggregatorImpl.java   2 Sep 2004 21:23:48 -   1.13
  +++ PageAggregatorImpl.java   15 Oct 2004 07:05:27 -  1.14
  @@ -157,7 +157,7 @@
   if (null != window)
   {
   Fragment fragment = page.getFragmentById(window.getId().toString());
  -if (checkAccess(context, (fragment.getAcl() != null) ? 
fragment.getAcl() : acl, "render"))
  +if (fragment != null && checkAccess(context, (fragment.getAcl() != 
null) ? fragment.getAcl() : acl, "render"))
   {
   
context.getRequest().setAttribute("org.apache.jetspeed.maximized.Fragment", fragment);
   
context.getRequest().setAttribute("org.apache.jetspeed.maximized.Layout", 
page.getRootFragment());
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl ProfilerValveImpl.java

[taylor]

taylor  2004/10/15 00:05:09

  Modified:portal/src/java/org/apache/jetspeed/profiler/impl
ProfilerValveImpl.java
  Log:
  patch from Randy Watler
  implementation of using a named profile locator specified in the docset metadata to 
find 'docsets'
  here we build the locator collections for finding pages and docsets and ...
  
  Revision  ChangesPath
  1.16  +29 -7 
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
  
  Index: ProfilerValveImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ProfilerValveImpl.java8 Oct 2004 06:49:37 -   1.15
  +++ ProfilerValveImpl.java15 Oct 2004 07:05:09 -  1.16
  @@ -16,7 +16,11 @@
   package org.apache.jetspeed.profiler.impl;
   
   import java.io.IOException;
  +import java.security.Principal;
  +import java.util.HashMap;
  +import java.util.Map;
   
  +import javax.security.auth.Subject;
   import javax.servlet.http.HttpServletRequest;
   
   import org.apache.commons.logging.Log;
  @@ -27,10 +31,14 @@
   import org.apache.jetspeed.pipeline.valve.AbstractValve;
   import org.apache.jetspeed.pipeline.valve.PageProfilerValve;
   import org.apache.jetspeed.pipeline.valve.ValveContext;
  +import org.apache.jetspeed.profiler.impl.JetspeedProfiledPageContext;
   import org.apache.jetspeed.profiler.ProfileLocator;
   import org.apache.jetspeed.profiler.ProfiledPageContext;
   import org.apache.jetspeed.profiler.Profiler;
  +import org.apache.jetspeed.profiler.ProfilerException;
   import org.apache.jetspeed.request.RequestContext;
  +import org.apache.jetspeed.security.SecurityHelper;
  +import org.apache.jetspeed.security.UserPrincipal;
   
   /**
* ProfilerValveImpl
  @@ -63,16 +71,29 @@
   {
   try
   {
  -// perform profiling to get profiled page context using
  -// the profiler and page manager
  -ProfileLocator locator = profiler.getProfile(request, 
ProfileLocator.PAGE_LOCATOR);
  -ProfiledPageContext profiledPageContext = 
pageManager.getProfiledPageContext(locator);
  -if ((profiledPageContext == null) || (profiledPageContext.getPage() == 
null) || (profiledPageContext.getLocator() == null)) 
  +// get profiler locators for request subject/principal using the 
profiler
  +Subject subject = request.getSubject();
  +if (subject == null)
  +throw new ProfilerException("Missing subject for request: " + 
request.getPath());
  +Principal principal = SecurityHelper.getBestPrincipal(subject, 
UserPrincipal.class);
  +if (principal == null)
  +throw new ProfilerException("Missing principal for request: " + 
request.getPath());
  +String [] locatorNames = 
profiler.getLocatorNamesForPrincipal(principal);
  +if ((locatorNames == null) || (locatorNames.length == 0))
  +locatorNames = new String[]{ProfileLocator.PAGE_LOCATOR};
  +Map locators = (Map) new HashMap(16);
  +for (int i = 0; (i < locatorNames.length); i++)
  +locators.put(locatorNames[i], 
profiler.getProfile(request,locatorNames[i]));
  +
  +// get profiled page context using the profiler and page manager
  +ProfiledPageContext profiledPageContext = 
profiler.createProfiledPageContext(locators);
  +pageManager.computeProfiledPageContext(profiledPageContext);
  +if (profiledPageContext.getPage() == null)
   throw new NodeNotFoundException("Unable to profile request: " + 
request.getPath());
   
   // set request page and profile locator
   request.setPage(profiledPageContext.getPage());
  -request.setProfileLocator(profiledPageContext.getLocator());
  +request.setProfileLocators(profiledPageContext.getLocators());
   
   // return profiled page context in request attribute
   HttpServletRequest httpRequest = request.getRequest();
  @@ -95,6 +116,7 @@
   }
   catch (Exception e)
   {
  +log.error("Exception in request pipeline: " + e.getMessage(), e);
   throw new PipelineException(e.toString(), e);
   }
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal maven.xml

[taylor]

taylor  2004/10/15 00:03:46

  Modified:portal   maven.xml
  Log:
  add MS SQL support to population scripts
  
  Revision  ChangesPath
  1.108 +4 -1  jakarta-jetspeed-2/portal/maven.xml
  
  Index: maven.xml
  ===
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- maven.xml 14 Oct 2004 19:03:36 -  1.107
  +++ maven.xml 15 Oct 2004 07:03:46 -  1.108
  @@ -565,6 +565,9 @@
   
   -->
   
  +  
  +  
  + 
 


  @@ -647,4 +650,4 @@

 
   
  -
  \ No newline at end of file
  +
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly page-manager.xml

[taylor]

taylor  2004/10/15 00:03:26

  Modified:portal/src/webapp/WEB-INF/assembly page-manager.xml
  Log:
  configure the docset handler and new page cache
  patch from Randy Watler
  
  Revision  ChangesPath
  1.3   +14 -1 
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/page-manager.xml
  
  Index: page-manager.xml
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/page-manager.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- page-manager.xml  17 Sep 2004 20:04:53 -  1.2
  +++ page-manager.xml  15 Oct 2004 07:03:26 -  1.3
  @@ -35,6 +35,15 @@
   
 
 
  +   

  +/META-INF/page-mapping.xml
  +.ds
  +org.apache.jetspeed.om.folder.DocumentSet  
  +${applicationRoot}/WEB-INF/pages
  +
  +  
  +  
  

   /META-INF/page-mapping.xml
  @@ -54,6 +63,9 @@
  


  +   
  + 
  + 
  

  
  @@ -76,7 +88,8 @@
   
   
   
  -true
  +100
  +true
 
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/navigation/html/linksWithIcon1 TopToBottom.vm LeftToRight.vm

[taylor]

taylor  2004/10/15 00:00:49

  Modified:portal/src/webapp/WEB-INF/templates/navigation/html/linksWithIcon1
TopToBottom.vm LeftToRight.vm
  Log:
  *** keyword substitution change ***
  
  Revision  ChangesPath
  1.2   +11 -3 
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/navigation/html/linksWithIcon1/TopToBottom.vm
  
  Index: TopToBottom.vm
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/navigation/html/linksWithIcon1/TopToBottom.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TopToBottom.vm17 Sep 2004 18:05:25 -  1.1
  +++ TopToBottom.vm15 Oct 2004 07:00:49 -  1.2
  @@ -1,7 +1,15 @@
   
  -  #foreach($link in $_nodeSet.iterator()) 
  +  #foreach($node in $_nodeSet.iterator()) 
 
  -$link.getTitle($preferedLocale)   
  +#if($node.type == ".psml")
  +  $node.getTitle($preferedLocale) 
  +#elseif($node.type == ".link")
  +  $node.getTitle($preferedLocale) 
  +#elseif($node.type == "folder")
  +  $node.metaData.getTitle($preferedLocale)  
  +#else
  +  $node.title
  +#end
  
 #end
  -
  \ No newline at end of file
  +
  
  
  
  1.2   +12 -4 
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/navigation/html/linksWithIcon1/LeftToRight.vm
  
  Index: LeftToRight.vm
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/navigation/html/linksWithIcon1/LeftToRight.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LeftToRight.vm17 Sep 2004 18:05:25 -  1.1
  +++ LeftToRight.vm15 Oct 2004 07:00:49 -  1.2
  @@ -1,5 +1,13 @@
   
  -  #foreach($link in $_nodeSet.iterator()) 
  - $link.getTitle($preferedLocale)  
  -   #end
  -
  \ No newline at end of file
  +  #foreach($node in $_nodeSet.iterator()) 
  +#if($node.type == ".psml")
  +  $node.getTitle($preferedLocale) 
  +#elseif($node.type == ".link")
  +  $node.getTitle($preferedLocale) 
  +#elseif($node.type == "folder")
  +  $node.metaData.getTitle($preferedLocale)  
  +#else
  +  $node.title
  +#end
  +  #end
  +
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user top-pages.ds folder.metadata

[taylor]

taylor  2004/10/15 00:00:18

  Modified:portal/src/webapp/WEB-INF/pages/_user/user folder.metadata
  Added:   portal/src/webapp/WEB-INF/pages/_role/user/top-links
apache_commons.link apache_jakarta.link
folder.metadata apache_tomcat.link
apache_velocity.link apache_portals.link
jakarta_velocity.link
   portal/src/webapp/WEB-INF/pages pages.ds non-java.ds
top-pages.ds
   portal/src/webapp/WEB-INF/pages/Administrative user-admin.ds
   portal/src/webapp/WEB-INF/pages/_user/user top-pages.ds
  Log:
  patch from Randy Watler, lots of new .link, .ds and .psml files for testing out 
docsets
  
  Revision  ChangesPath
  1.1  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/apache_commons.link
  
  Index: apache_commons.link
  ===
  

  

   [USER] Apache Commons

   http://jakarta.apache.org/commons

  

  
  
  
  1.1  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/apache_jakarta.link
  
  Index: apache_jakarta.link
  ===
  

  

   [USER] Apache Jakarta

   http://jakarta.apache.org

  

  
  
  
  1.1  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/folder.metadata
  
  Index: folder.metadata
  ===
  

  

apache_portals.link

apache_jakarta.link

apache_tomcat.link

apache_velocity.link

apache_commons.link

  

  
  
  
  1.1  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/apache_tomcat.link
  
  Index: apache_tomcat.link
  ===
  

  

   [USER] Apache Tomcat

   http://jakarta.apache.org/tomcat

  

  
  
  
  1.1  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/apache_velocity.link
  
  Index: apache_velocity.link
  ===
  

  

   [USER] Apache Velocity

   http://jakarta.apache.org/velocity

  

  
  
  
  1.1  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/apache_portals.link
  
  Index: apache_portals.link
  ===
  

  

   [USER] Apache Portals

   http://portals.apache.org

  

  
  
  
  1.1  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/jakarta_velocity.link
  
  Index: jakarta_velocity.link
  ===
  

  

   Apache Velocity

   http://jakarta.apache.org/velocity

  

  
  
  
  1.1  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/pages.ds
  
  Index: pages.ds
  ===
  

  

Profiled Pages

pages

page

/p[0-9][0-9][0-9].psml

  

  
  
  
  1.1  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/non-java.ds
  
  Index: non-java.ds
  ===
  

  

Non Java Pages

non-java

  

  
  
  
  1.1  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/top-pages.ds
  
  Index: top-pages.ds
  ===
  

  

Top Pages

Page haut

top_pages

docset

/Administrative

  

  
  
  
  1.1  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/user-admin.ds
  
  Index: user-admin.ds
  ===
  

  

Users Admin Pages

user-admin

/Administrative/user-mgt.psml

/Administrative/users-jsf.psml

  

  
  
  
  1.2   +4 -0  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/folder.metadata
  
  Index: folder.metadata
  ===
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/folder.metadata,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- folder.metadata   17 Sep 2004 20:06:26 -  1.1
  +++ folder.metadata   15 Oct 2004 07:00:18 -  1.2
  @@ -18,4 +18,8 @@
 third-party
 non-java
 Administrative
  +
  +  top-pages.ds
  +  pages.ds
  +  non-java.ds
   
  
  
  
  1.1  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/top-pages.ds
  
  Index: top-pages.ds
  ===
  

  

[USER] Top Pages

[USER] Page haut

top_pages

docset

/top-links/*.link

  

  
  
 

cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user - New directory

[taylor]

taylor  2004/10/15 00:00:16

  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user - New directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links - New directory

[taylor]

taylor  2004/10/15 00:00:16

  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links - New 
directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]