morciuch 2003/01/21 12:43:36
Modified: docs/site changes.html
src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeSetAction.java
src/java/org/apache/jetspeed/modules/localization
JetspeedLocalization_en.properties
xdocs changes.xml
Log:
When attempting to add reference to a non-protected psml, a warning is now logged +
rundata message is set (see Bugzilla bug# 15414).
Although the message is set, it is currently not displayed anywhere. This should be
addressed separately at a global level.
Revision Changes Path
1.99 +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.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- changes.html 17 Jan 2003 21:30:37 -0000 1.98
+++ changes.html 21 Jan 2003 20:43:35 -0000 1.99
@@ -133,10 +133,13 @@
</li>
-->
<li>
+ Fixed - Bug # 15414 - 2003/01/21 - Addressed problem with Customizer only
allowing one Reference to be added (MO)
+</li>
+<li>
Fixed - Bug # 16187 - 2003/01/17 - Fixed "Error retrieving Portal Page" received
after new user changes password (MO)
</li>
<li>
- Add - Bug # 15215 - 2003/01/17 - Added Jetspeed Questionnaire portlet (MO)
+ Added - Bug # 15215 - 2003/01/17 - Added Jetspeed Questionnaire portlet (MO)
</li>
<li>
Update - Bug # 16174 - 2003/01/16 - Enabled security ref selection in the
customizers for user role (MO)
1.38 +17 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java
Index: CustomizeSetAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- CustomizeSetAction.java 13 Jan 2003 17:24:35 -0000 1.37
+++ CustomizeSetAction.java 21 Jan 2003 20:43:35 -0000 1.38
@@ -105,7 +105,7 @@
import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
-
+import org.apache.turbine.services.localization.Localization;
// Velocity Stuff
@@ -121,7 +121,7 @@
import java.util.Iterator;
import java.util.Collections;
import java.util.Comparator;
-
+import java.text.MessageFormat;
/**
* This action implements the default portletset behavior customizer
@@ -717,6 +717,20 @@
ref.setPath(refNames[i]);
ref.setSecurityRef(sref);
portlets.addReference(ref);
+ }
+ else
+ {
+ String tmpl =
Localization.getString("CUSTOMIZER_ADD_REF_ERROR");
+ Object[] args = {
+ refNames[i]
+ };
+ String message = MessageFormat.format(tmpl, args).toString();
+
+ rundata.addMessage(message.concat("<br>"));
+ if (Log.getLogger().isWarnEnabled())
+ {
+ Log.warn(message);
+ }
}
}
}
1.27 +2 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties
Index: JetspeedLocalization_en.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- JetspeedLocalization_en.properties 8 Dec 2002 19:33:52 -0000 1.26
+++ JetspeedLocalization_en.properties 21 Jan 2003 20:43:35 -0000 1.27
@@ -180,6 +180,7 @@
CUSTOMIZER_TITLE=Title
CUSTOMIZER_TYPE=Type
CUSTOMIZER_UPDATE=Update
+CUSTOMIZER_ADD_REF_ERROR=Psml [{0}] must have a security ref in order to be
referenced
PASSWORDFORM_TITLE=Change your account password
PASSWORDFORM_USERNAMEMSG=Username:
1.116 +5 -2 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- changes.xml 17 Jan 2003 21:30:37 -0000 1.115
+++ changes.xml 21 Jan 2003 20:43:36 -0000 1.116
@@ -23,10 +23,13 @@
</li>
-->
<li>
+ Fixed - Bug # 15414 - 2003/01/21 - Addressed problem with Customizer only
allowing one Reference to be added (MO)
+</li>
+<li>
Fixed - Bug # 16187 - 2003/01/17 - Fixed "Error retrieving Portal Page" received
after new user changes password (MO)
</li>
<li>
- Add - Bug # 15215 - 2003/01/17 - Added Jetspeed Questionnaire portlet (MO)
+ Added - Bug # 15215 - 2003/01/17 - Added Jetspeed Questionnaire portlet (MO)
</li>
<li>
Update - Bug # 16174 - 2003/01/16 - Enabled security ref selection in the
customizers for user role (MO)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
