You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2002/07/20 06:48:33 UTC
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html customizer-portletset-layout.vm customizer-portletset.vm
taylor 2002/07/19 21:48:33
Modified: docs/site changes.html
src/java/org/apache/jetspeed/modules/actions/controls
Customize.java
src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeSetAction.java
src/java/org/apache/jetspeed/util AutoProfile.java
webapp/WEB-INF/conf JetspeedSecurity.properties
webapp/WEB-INF/templates/vm/navigations/html top.vm
webapp/WEB-INF/templates/vm/portlets/html
customizer-portletset-layout.vm
customizer-portletset.vm
Log:
Getting further along with customizing from PSML Browser. It seems that we can no longer customize WML (or other media types). The group sample PSML is either invalid or the customizer can't handle it.
Getting pretty frustrated with the customizer. I just don't have the cycles to clean this thing up properly right now :( I'd like to remove AutoProfile and all the hard-coded WML code, but Im having trouble understanding what's going on with all the hard-coding in there. Afraid Im going to have to put this off and revisit it in August.
Revision Changes Path
1.27 +27 -4 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- changes.html 17 Jul 2002 07:07:22 -0000 1.26
+++ changes.html 20 Jul 2002 04:48:32 -0000 1.27
@@ -14,7 +14,7 @@
- <title>Jetspeed - Jetspeed Todo</title>
+ <title>Jetspeed - Jetspeed Changes Log</title>
</head>
<body bgcolor="#ffffff" text="#000000" link="#525D76">
@@ -113,7 +113,7 @@
<table border="0" cellspacing="0" cellpadding="2" width="100%">
<tr><td bgcolor="#525D76">
<font color="#ffffff" face="arial,helvetica,sanserif">
- <a name="Changes since version 1.3a2"><strong>Changes since version 1.3a2</strong></a>
+ <a name="Changes since version 1.4b1"><strong>Changes since version 1.4b1</strong></a>
</font>
</td></tr>
<tr><td>
@@ -121,14 +121,37 @@
<ul>
<!--
***
-*** Format of change entry. The entry should be appened to the list.
+*** Format of change entry. The entry should be appended to the list.
*** Note: Optional text is inclosed in []
***
<li>
action (add/remove/update/fix) - [Bug # xxx -] date - description (committer's initials) [Thanks to developer_name]
</li>
-->
-
+ </ul>
+ <li>
+ Add - 2002/07/19 - Weather Portlet from Ozgur Balsoy (DST)
+</li>
+ <li>
+ Add - 2002/07/19 - Category Filter on Customizer from Scott Weaver (DST)
+</li>
+ <li>
+ Add - 2002/07/19 - Allow for portlets to be selection one or more times on Customizer from Scott Weaver (DST)
+</li>
+ </blockquote>
+ </p>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <table border="0" cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#525D76">
+ <font color="#ffffff" face="arial,helvetica,sanserif">
+ <a name="Changes since version 1.3a2"><strong>Changes since version 1.3a2</strong></a>
+ </font>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <ul>
<li>
Add - Added Change Log (PS)
</li>
1.10 +1 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Customize.java
Index: Customize.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Customize.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Customize.java 28 Jun 2002 05:37:28 -0000 1.9
+++ Customize.java 20 Jul 2002 04:48:32 -0000 1.10
@@ -95,7 +95,7 @@
// Andreas Kempf, Siemens ICM S CP PE, Munich
// ---------------------------------------------------------------------
- String editMediaType = rundata.getParameters().getString ("mtype");
+ String editMediaType = rundata.getParameters().getString ("mediatype");
String resetStack = rundata.getParameters().getString ("reset");
// RESET (remove) all Stackentries - used on first customization!!!
1.20 +1 -1 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CustomizeSetAction.java 19 Jul 2002 20:56:18 -0000 1.19
+++ CustomizeSetAction.java 20 Jul 2002 04:48:32 -0000 1.20
@@ -145,7 +145,7 @@
String mediaType = jdata.getProfile().getMediaType ();
// set velocity variable of mediatype (displayed in the customizer menu)
- context.put("mtype", profile.getMediaType());
+ context.put("mediatype", profile.getMediaType());
// make the list of already used panes/portlets available through the 'runs' reference
1.4 +8 -9 jakarta-jetspeed/src/java/org/apache/jetspeed/util/AutoProfile.java
Index: AutoProfile.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/AutoProfile.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AutoProfile.java 1 Apr 2002 18:06:27 -0000 1.3
+++ AutoProfile.java 20 Jul 2002 04:48:32 -0000 1.4
@@ -29,13 +29,17 @@
*/
public static Profile loadProfile (RunData rundata, String mediaType) throws Exception
{
- Profiler myProfiler = new Profiler ();
+
+System.out.println("LOADING PROFILE: " + mediaType);
+// Profile profile = Profiler.getProfile(rundata);
+// ((JetspeedRunData)rundata).setProfile (profile);
+// return profile;
if ((mediaType != null) && (mediaType.equalsIgnoreCase("wml")))
{
((JetspeedRunData)rundata).getProfile().store();
- Profile myPro = myProfiler.getProfile (rundata, MimeType.WML);
+ Profile myPro = Profiler.getProfile (rundata, MimeType.WML);
((JetspeedRunData)rundata).setProfile (myPro);
// It is essential that a session object exists!
@@ -45,17 +49,14 @@
{
((JetspeedRunData)rundata).getProfile().store();
- Profile myPro = myProfiler.getProfile (rundata, MimeType.HTML);
+ Profile myPro = Profiler.getProfile (rundata, MimeType.HTML);
((JetspeedRunData)rundata).setProfile (myPro);
// It is essential that a session object exists!
rundata.getSession().setAttribute ("customizeType", "html");
}
-
-
-
- return ((JetspeedRunData)rundata).getProfile();
+ return ((JetspeedRunData)rundata).getProfile();
}
@@ -69,7 +70,6 @@
*/
public static Profile doIt (RunData rundata, boolean notForce) throws Exception
{
-
// retrieve current customization mediatype (stored in the user session object)
HttpSession ses = rundata.getSession ();
@@ -105,7 +105,6 @@
else
return loadProfile (rundata, "html");
}
-
return ((JetspeedRunData)rundata).getProfile();
}
1.18 +0 -0 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties
Index: JetspeedSecurity.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
1.17 +1 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm
Index: top.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- top.vm 7 May 2002 07:31:44 -0000 1.16
+++ top.vm 20 Jul 2002 04:48:32 -0000 1.17
@@ -45,7 +45,7 @@
<td align="right" style="font-size:10">
$l10n.TOP_CUSTOMIZE:
<a href="$jslink.setAction("controls.Customize").addQueryData("reset","on")" style="font-size:10">HTML</a>
- <a href="$jslink.setAction("controls.Customize").addQueryData("reset","on").addQueryData("mtype","wml")" style="font-size:10">WML</a>
+ <a href="$jslink.setAction("controls.Customize").addQueryData("reset","on").addQueryData("media-type","wml")" style="font-size:10">WML</a>
</td>
</tr>
<tr>
1.9 +6 -6 jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-layout.vm
Index: customizer-portletset-layout.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-layout.vm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- customizer-portletset-layout.vm 30 Jun 2002 18:53:50 -0000 1.8
+++ customizer-portletset-layout.vm 20 Jul 2002 04:48:33 -0000 1.9
@@ -15,7 +15,7 @@
#end
<input type="hidden" name="eventSubmit_doLayout" value="layout">
## No Controller-Selection for WML Profiles
- #if (($!mtype=="wml") || ($!mtype=="WML"))
+ #if (($!mediatype=="wml") || ($!mediatype=="WML"))
<select name="controller" onChange="document.controllers.submit()" disabled>
#else
<select name="controller" onChange="document.controllers.submit()">
@@ -31,7 +31,7 @@
#end
</select>
## No submit-Button for WML Profiles
- #if (($!mtype=="wml") || ($!mtype=="WML"))
+ #if (($!mediatype=="wml") || ($!mediatype=="WML"))
## <input type="submit" value="OK" disabled class="BUTON">
#else
## <input type="submit" name="btn_submit" value="OK" disabled>
@@ -67,7 +67,7 @@
<form name="skins" action="$jslink.Template" method="post">
#if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action" > #end
<input type="hidden" name="eventSubmit_doSkin" value="skin"> ## No Controller-Selection for WML Profiles
- #if (($!mtype=="wml") || ($!mtype=="WML"))
+ #if (($!mediatype=="wml") || ($!mediatype=="WML"))
<select name="skin" onChange="document.skins.submit()" disabled>
#else
<select name="skin" onChange="document.skins.submit()">
@@ -80,7 +80,7 @@
</select>
## No submit-Button for WML Profiles
- #if (($!mtype=="wml") || ($!mtype=="WML"))
+ #if (($!mediatype=="wml") || ($!mediatype=="WML"))
## <input type="submit" value="OK" disabled>
#else
## <input type="submit" value="OK">
@@ -98,7 +98,7 @@
<form name="securityRefs" action="$jslink.Template" method="post">
#if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action" > #end
<input type="hidden" name="eventSubmit_doSecurity" value="securityRef"> ## No Controller-Selection for WML Profiles
- #if (($!mtype=="wml") || ($!mtype=="WML"))
+ #if (($!mediatype=="wml") || ($!mediatype=="WML"))
<select name="securityRef" onChange="document.securityRefs.submit()" disabled>
#else
<select name="securityRef" onChange="document.securityRefs.submit()">
@@ -111,7 +111,7 @@
</select>
## No submit-Button for WML Profiles
- #if (($!mtype=="wml") || ($!mtype=="WML"))
+ #if (($!mediatype=="wml") || ($!mediatype=="WML"))
## <input type="submit" value="OK" disabled>
#else
## <input type="submit" value="OK">
1.10 +2 -2 jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset.vm
Index: customizer-portletset.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset.vm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- customizer-portletset.vm 7 May 2002 14:17:06 -0000 1.9
+++ customizer-portletset.vm 20 Jul 2002 04:48:33 -0000 1.10
@@ -3,8 +3,8 @@
<tr>
<td align="left" nowrap width="20%" >
## Show customizer content-type
- #if ($mtype)
- $l10n.CUSTOMIZER_MEDIATYPE : <b>$mtype</b>
+ #if ($mediatype)
+ $l10n.CUSTOMIZER_MEDIATYPE : <b>$mediatype</b>
#else
#end
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>