morciuch 2003/03/25 08:22:07
Modified: docs/site changes.html usejetspeed.html
src/java/org/apache/jetspeed/modules/actions/portlets/security
UserRoleUpdateAction.java
xdocs changes.xml usejetspeed.xml
Log:
1. Minor fix to issue with profile merging when new role is added (see Bugzilla bug#
17289).
2. Updated list of jetspeed-powered sites.
Revision Changes Path
1.119 +4 -1 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- changes.html 19 Mar 2003 23:03:22 -0000 1.118
+++ changes.html 25 Mar 2003 16:22:06 -0000 1.119
@@ -133,6 +133,9 @@
</li>
-->
<li>
+ Fix - Bug # 17289 - 2003/03/25 - Fixed a minor bug related to the original
enhancement (MO)
+</li>
+<li>
Fixed - Bug # 17903 - 2003/03/19 - Fixed issue with adding new portlet via the
portlet browser, patch by Jeremy Ford (MO)
</li>
<li>
@@ -154,7 +157,7 @@
Add - Bug # 11738 - 2003/03/04 - New Portlet Customizer with Add and Edit
Portlet features contributed by Jeremy Ford (DST)
</li>
<li>
- Add - 2003/02/26 - ChangeLanguagePortlet, contributed by Dess�
Massimiliano (DST)
+ Add - Bug # 14433 - 2003/02/26 - ChangeLanguagePortlet, contributed by Dess�
Massimiliano (DST)
</li>
<li>
Fixed - Bug # 16143 - 2003/02/18 - Added functionality to define default security
constraint for new portal resources (MO)
1.30 +195 -171 jakarta-jetspeed/docs/site/usejetspeed.html
Index: usejetspeed.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/usejetspeed.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- usejetspeed.html 8 Mar 2003 02:17:47 -0000 1.29
+++ usejetspeed.html 25 Mar 2003 16:22:06 -0000 1.30
@@ -1,134 +1,132 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
-
-<!-- Content Stylesheet for Site -->
-
-
-<!-- start the processing -->
- <!-- ====================================================================== -->
- <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
- <!-- Main Page Section -->
- <!-- ====================================================================== -->
- <html>
- <head>
- <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"/>
-
-
-
-
-
- <title>Jetspeed - Use Jetspeed</title>
- </head>
-
- <body bgcolor="#ffffff" text="#000000" link="#525D76">
- <table border="0" width="100%" cellspacing="0">
- <!-- TOP IMAGE -->
- <tr>
- <td align="left">
-<a href="http://jakarta.apache.org";><img
src="http://jakarta.apache.org/images/jakarta-logo.gif"; border="0"/></a>
-</td>
-<td align="right">
-<a href="http://jakarta.apache.org/jetspeed/";><img src="./images/logo.gif"
alt="Jetspeed" border="0"/></a>
-</td>
- </tr>
- </table>
- <table border="0" width="100%" cellspacing="4">
- <tr><td colspan="2">
- <hr noshade="" size="1"/>
- </td></tr>
-
- <tr>
- <!-- LEFT SIDE NAVIGATION -->
- <td width="20%" valign="top" nowrap="true">
- <p><strong>Essentials</strong></p>
- <ul>
- <li> <a href="./index.html">Overview</a>
-</li>
- <li> <a href="./features.html">Features</a>
-</li>
- <li> <a href="./license.html">License</a>
-</li>
- <li> <a href="./install.html">Installation</a>
-</li>
- <li> <a href="./faq.html">FAQ</a>
-</li>
- <li> <a href="./usejetspeed.html">Sample Sites</a>
-</li>
- <li> <a href="./resources.html">Resources</a>
-</li>
- <li> <a href="./todo.html">Todo</a>
-</li>
- <li> <a href="./changes.html">Changes</a>
-</li>
- </ul>
- <p><strong>Download</strong></p>
- <ul>
- <li> <a
href="http://jakarta.apache.org/site/binindex.html";>Binaries</a>
-</li>
- <li> <a
href="http://jakarta.apache.org/site/sourceindex.html";>Source Code</a>
-</li>
- <li> <a href="./supporting-projects.html">Supporting
Projects</a>
-</li>
- </ul>
- <p><strong>Documentation</strong></p>
- <ul>
- <li> <a href="./config_guide.html">Configuration Guide</a>
-</li>
- <li> <a
href="http://jakarta.apache.org/jetspeed/api/index.html";>Javadocs</a>
-</li>
- <li> <a href="./application-development.html">Development</a>
-</li>
- <li> <a
href="http://www.bluesunrise.com/jetspeed-docs/JetspeedTutorial.htm";>Jetspeed
Tutorial</a>
-</li>
- <li> <a href="./catalog.html">Portlet Catalog</a>
-</li>
- </ul>
- <p><strong>Components</strong></p>
- <ul>
- <li> <a href="./registry.html">Registry</a>
-</li>
- <li> <a href="./security.html">Security</a>
-</li>
- <li> <a href="./content-syndication.html">Syndication</a>
-</li>
- <li> <a href="./wap.html">WAP</a>
-</li>
- <li> <a href="./customizer.html">Customization</a>
-</li>
- <li> <a href="./diskcache.html">Cache</a>
-</li>
- <li> <a href="./psml.html">PSML</a>
-</li>
- </ul>
- <p><strong>Get Involved</strong></p>
- <ul>
- <li> <a href="./contributors.html">Contributors</a>
-</li>
- <li> <a
href="http://jakarta.apache.org/site/cvsindex.html";>CVS Repository</a>
-</li>
- <li> <a
href="http://cvs.apache.org/viewcvs/jakarta-jetspeed/";>View CVS</a>
-</li>
- <li> <a href="./branches.html">CVS Branches</a>
-</li>
- <li> <a href="./code-standards.html">Coding Spec</a>
-</li>
- <li> <a
href="http://issues.apache.org/bugzilla/buglist.cgi?product=jetspeed";>Bug Database</a>
-</li>
- </ul>
- </td>
- <td width="80%" align="left" valign="top">
- <table
border="0" cellspacing="0" cellpadding="2" width="100%">
- <tr><td bgcolor="#525D76">
- <font color="#ffffff" face="arial,helvetica,sanserif">
- <a name="Use Jetspeed"><strong>Use Jetspeed</strong></a>
- </font>
- </td></tr>
- <tr><td>
- <blockquote>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+
+<!-- Content Stylesheet for Site -->
+
+
+<!-- start the processing -->
+ <!-- ====================================================================== -->
+ <!-- Main Page Section -->
+ <!-- ====================================================================== -->
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"/>
+
+
+
+
+ <title>Jetspeed - Use Jetspeed</title>
+ </head>
+
+ <body bgcolor="#ffffff" text="#000000" link="#525D76">
+ <table border="0" width="100%" cellspacing="0">
+ <!-- TOP IMAGE -->
+ <tr>
+ <td align="left">
+<a href="http://jakarta.apache.org";><img
src="http://jakarta.apache.org/images/jakarta-logo.gif"; border="0"/></a>
+</td>
+<td align="right">
+<a href="http://jakarta.apache.org/jetspeed/";><img src="./images/logo.gif"
alt="Jetspeed" border="0"/></a>
+</td>
+ </tr>
+ </table>
+ <table border="0" width="100%" cellspacing="4">
+ <tr><td colspan="2">
+ <hr noshade="" size="1"/>
+ </td></tr>
+
+ <tr>
+ <!-- LEFT SIDE NAVIGATION -->
+ <td width="20%" valign="top" nowrap="true">
+ <p><strong>Essentials</strong></p>
+ <ul>
+ <li> <a href="./index.html">Overview</a>
+</li>
+ <li> <a href="./features.html">Features</a>
+</li>
+ <li> <a href="./license.html">License</a>
+</li>
+ <li> <a href="./install.html">Installation</a>
+</li>
+ <li> <a href="./faq.html">FAQ</a>
+</li>
+ <li> <a href="./usejetspeed.html">Sample Sites</a>
+</li>
+ <li> <a href="./resources.html">Resources</a>
+</li>
+ <li> <a href="./todo.html">Todo</a>
+</li>
+ <li> <a href="./changes.html">Changes</a>
+</li>
+ </ul>
+ <p><strong>Download</strong></p>
+ <ul>
+ <li> <a
href="http://jakarta.apache.org/site/binindex.html";>Binaries</a>
+</li>
+ <li> <a
href="http://jakarta.apache.org/site/sourceindex.html";>Source Code</a>
+</li>
+ <li> <a href="./supporting-projects.html">Supporting
Projects</a>
+</li>
+ </ul>
+ <p><strong>Documentation</strong></p>
+ <ul>
+ <li> <a href="./config_guide.html">Configuration Guide</a>
+</li>
+ <li> <a
href="http://jakarta.apache.org/jetspeed/api/index.html";>Javadocs</a>
+</li>
+ <li> <a href="./application-development.html">Development</a>
+</li>
+ <li> <a
href="http://www.bluesunrise.com/jetspeed-docs/JetspeedTutorial.htm";>Jetspeed
Tutorial</a>
+</li>
+ <li> <a href="./catalog.html">Portlet Catalog</a>
+</li>
+ </ul>
+ <p><strong>Components</strong></p>
+ <ul>
+ <li> <a href="./registry.html">Registry</a>
+</li>
+ <li> <a href="./security.html">Security</a>
+</li>
+ <li> <a href="./content-syndication.html">Syndication</a>
+</li>
+ <li> <a href="./wap.html">WAP</a>
+</li>
+ <li> <a href="./customizer.html">Customization</a>
+</li>
+ <li> <a href="./diskcache.html">Cache</a>
+</li>
+ <li> <a href="./psml.html">PSML</a>
+</li>
+ </ul>
+ <p><strong>Get Involved</strong></p>
+ <ul>
+ <li> <a href="./contributors.html">Contributors</a>
+</li>
+ <li> <a
href="http://jakarta.apache.org/site/cvsindex.html";>CVS Repository</a>
+</li>
+ <li> <a
href="http://cvs.apache.org/viewcvs/jakarta-jetspeed/";>View CVS</a>
+</li>
+ <li> <a href="./branches.html">CVS Branches</a>
+</li>
+ <li> <a href="./code-standards.html">Coding Spec</a>
+</li>
+ <li> <a
href="http://issues.apache.org/bugzilla/buglist.cgi?product=jetspeed";>Bug Database</a>
+</li>
+ </ul>
+ </td>
+ <td width="80%" align="left" valign="top">
+ <table
border="0" cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#525D76">
+ <font color="#ffffff" face="arial,helvetica,sanserif">
+ <a name="Use Jetspeed"><strong>Use Jetspeed</strong></a>
+ </font>
+ </td></tr>
+ <tr><td>
+ <blockquote>
<p>
The following sites are based on Jetspeed.
Please note that some of them are using the development version and their
availability/stability
may change from time to time.
-</p>
+</p>
<p>
<ul>
<li>
@@ -172,8 +170,34 @@
upload their books cover, put news, etc.
<p />
</li>
+ <li>
+ <a href="http://www.nmrshiftdb.org/";>http://www.nmrshiftdb.org</a>
+ <BR />NMRShiftDB is an open-source, open-access, open-submission,
open-content web database for chemical
+ structures and their nuclear magnetic resonance data
+ <P />
+ </li>
+ <li>
+ <a href="http://www.inflexa.com/portal/";>http://www.inflexa.com/portal</a>
+ <BR />Jetspeed based site in Chile used to work internally and engage
customers
+ <P />
+ </li>
+ <li>
+ <a href="http://www.solin.cl/";>http://www.solin.cl</a>
+ <BR />Jetspeed based site in Chile
+ <P />
+ </li>
+ <li>
+ <a href="http://www.microsystem.cl/";>http://www.microsystem.cl</a>
+ <BR />Jetspeed based site in Chile
+ <P />
+ </li>
+ <li>
+ <a href="http://www.zurban.com/";>http://www.zurban.com</a>
+ <BR />Zurban.com, is a French city guide focused on Paris
+ <P />
+ </li>
</ul>
-</p>
+</p>
<p>
A version 1.2b2 is running at:
<ul>
@@ -181,7 +205,7 @@
<a href="http://XMLmodeling.com";>http://XMLmodeling.com/</a>
</li>
</ul>
-</p>
+</p>
<p>
Jetspeed Slide Show:
<ul>
@@ -190,45 +214,45 @@
<a
href="http://www.bluesunrise.com/jetspeed-docs/Jetspeed-Slides_files/frame.htm";>Jetspeed
Slide Show (IE only)</a>
</li>
</ul>
-</p>
- </blockquote>
- </p>
- </td></tr>
- <tr><td><br/></td></tr>
- </table>
- </td>
- </tr>
-
- <!-- FOOTER -->
- <tr><td colspan="2">
- <hr noshade="" size="1"/>
- </td></tr>
- <tr><td colspan="2">
- <div align="center"><font color="#525D76" size="-1"><em>
- Copyright © 1999-2002, Apache Software Foundation
- </em></font></div>
- </td></tr>
- </table>
- </body>
- </html>
-<!-- end the processing -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+</p>
+ </blockquote>
+ </p>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ </td>
+ </tr>
+
+ <!-- FOOTER -->
+ <tr><td colspan="2">
+ <hr noshade="" size="1"/>
+ </td></tr>
+ <tr><td colspan="2">
+ <div align="center"><font color="#525D76" size="-1"><em>
+ Copyright © 1999-2002, Apache Software Foundation
+ </em></font></div>
+ </td></tr>
+ </table>
+ </body>
+ </html>
+<!-- end the processing -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1.8 +6 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserRoleUpdateAction.java
Index: UserRoleUpdateAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserRoleUpdateAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- UserRoleUpdateAction.java 5 Mar 2003 22:53:21 -0000 1.7
+++ UserRoleUpdateAction.java 25 Mar 2003 16:22:06 -0000 1.8
@@ -266,7 +266,7 @@
{
// log the error msg
Log.error("Failed update role+permission: " + e);
-
+ Log.error(e);
//
// error on update - display error message
//
@@ -319,7 +319,10 @@
}
// Append role profile to user profile
- if (roleProfile != null && userProfile != null)
+ if (roleProfile != null &&
+ roleProfile.getDocument() != null &&
+ userProfile != null &&
+ userProfile.getDocument() != null)
{
Profile tmpProfile = (Profile) roleProfile.clone();
Portlets rolePortlets = tmpProfile.getDocument().getPortlets();
1.135 +5 -2 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- changes.xml 19 Mar 2003 23:03:22 -0000 1.134
+++ changes.xml 25 Mar 2003 16:22:06 -0000 1.135
@@ -23,6 +23,9 @@
</li>
-->
<li>
+ Fix - Bug # 17289 - 2003/03/25 - Fixed a minor bug related to the original
enhancement (MO)
+</li>
+<li>
Fixed - Bug # 17903 - 2003/03/19 - Fixed issue with adding new portlet via the
portlet browser, patch by Jeremy Ford (MO)
</li>
<li>
@@ -44,7 +47,7 @@
Add - Bug # 11738 - 2003/03/04 - New Portlet Customizer with Add and Edit
Portlet features contributed by Jeremy Ford (DST)
</li>
<li>
- Add - 2003/02/26 - ChangeLanguagePortlet, contributed by Dess�
Massimiliano (DST)
+ Add - Bug # 14433 - 2003/02/26 - ChangeLanguagePortlet, contributed by Dess�
Massimiliano (DST)
</li>
<li>
Fixed - Bug # 16143 - 2003/02/18 - Added functionality to define default security
constraint for new portal resources (MO)
1.12 +26 -0 jakarta-jetspeed/xdocs/usejetspeed.xml
Index: usejetspeed.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/usejetspeed.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- usejetspeed.xml 8 Mar 2003 02:17:01 -0000 1.11
+++ usejetspeed.xml 25 Mar 2003 16:22:07 -0000 1.12
@@ -63,6 +63,32 @@
upload their books cover, put news, etc.
<p/>
</li>
+ <li>
+ <a href="http://www.nmrshiftdb.org/";>http://www.nmrshiftdb.org</a>
+ <BR/>NMRShiftDB is an open-source, open-access, open-submission,
open-content web database for chemical
+ structures and their nuclear magnetic resonance data
+ <P/>
+ </li>
+ <li>
+ <a href="http://www.inflexa.com/portal/";>http://www.inflexa.com/portal</a>
+ <BR/>Jetspeed based site in Chile used to work internally and engage
customers
+ <P/>
+ </li>
+ <li>
+ <a href="http://www.solin.cl/";>http://www.solin.cl</a>
+ <BR/>Jetspeed based site in Chile
+ <P/>
+ </li>
+ <li>
+ <a href="http://www.microsystem.cl/";>http://www.microsystem.cl</a>
+ <BR/>Jetspeed based site in Chile
+ <P/>
+ </li>
+ <li>
+ <a href="http://www.zurban.com/";>http://www.zurban.com</a>
+ <BR/>Zurban.com, is a French city guide focused on Paris
+ <P/>
+ </li>
</ul>
</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
![http://jakarta.apache.org/images/jakarta-logo.gif"](http://jakarta.apache.org/images/jakarta-logo.gif"){kind=link}