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 jf...@apache.org on 2004/09/13 22:33:22 UTC
cvs commit: jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/resources PAMResources_ja.properties PAMResources.properties
jford 2004/09/13 13:33:22
Modified: applications/pam/src/webapp/WEB-INF/view portlet-detail.jsp
applications/pam/src/java/org/apache/jetspeed/portlets/pam
PortletApplicationDetail.java
applications/pam/src/java/org/apache/jetspeed/portlets/pam/resources
PAMResources_ja.properties PAMResources.properties
Log:
Added language editing support
Revision Changes Path
1.6 +1 -1 jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/portlet-detail.jsp
Index: portlet-detail.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/portlet-detail.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- portlet-detail.jsp 10 Sep 2004 21:46:29 -0000 1.5
+++ portlet-detail.jsp 13 Sep 2004 20:33:22 -0000 1.6
@@ -1 +1 @@
-<%--
Copyright 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.
--%>
<c:set var="portlet_tabs" value="${requestScope.portlet_tabs}"/>
<c:set var="selectedPortletTab" value="${requestScope.selected_portlet_tab}"/>
<span class="portlet-section-header">Selected Portlet</span>
<c:out value="${selectedPDef.name}"/>
<div id="portlet_tabs">
<c:set var="tab_items" value="${portlet_tabs}"/>
<c:set var="currentTab" value="${selectedPortletTab}"/>
<c:set var="url_param_name" value="selected_portlet_tab"/>
<%@ include file="tabs.jsp"%>
</div>
<br />
<c:if test="${selectedPortletTab.id == 'pd_details'}">
<table>
<tr>
<td>
<fmt:message key="pam.details.expiration_cache"/>
</td>
<td>
<c:out value="${selectedPDef.expirationCache}"/>
</td>
</tr>
</tr>
<td>
<fmt:message key="pam.details.id"/>
</td>
<td>
<c:out value="${selectedPDef.portletIdentifier}"/>
</td>
</tr>
</tr>
<td>
<fmt:message key="pam.details.unique_name"/>
</td>
<td>
<c:out value="${selectedPDef.uniqueName}"/>
</td>
</tr>
</tr>
<td>
<fmt:message key="pam.details.preference_validator"/>
</td>
<td>
<c:out value="${selectedPDef.preferenceValidatorClassname}"/>
</td>
</tr>
</tr>
<td>
<fmt:message key="pam.details.class_name"/>
</td>
<td>
<c:out value="${selectedPDef.className}"/>
</td>
</tr>
</table>
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_metadata'}">
<div id="portlet_metadata">
<c:set var="md" value="${selectedPDef.metadata}"/>
<c:set var="action_prefix" value="portlet."/>
<portlet:actionURL var="edit_metadata_link" >
</portlet:actionURL>
<%@ include file="metadata-detail.jsp" %>
</div>
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_preferences'}">
<c:set var="prefSet" value="${selectedPDef.preferenceSet}"/>
<%
PreferenceSetComposite comp = (PreferenceSetComposite)pageContext.findAttribute("prefSet");
Iterator prefIter = comp.iterator();
pageContext.setAttribute("prefIter", prefIter);
%>
<portlet:actionURL var="edit_preferenece_link" >
</portlet:actionURL>
<form action="<c:out value="${edit_preferenece_link}"/>">
<input type="hidden" name="portlet_action" value=""/>
<table border="1">
<tr>
<th> </th>
<th><fmt:message key="pam.details.name"/></th>
<th><fmt:message key="pam.details.value"/></th>
</tr>
<c:forEach var="pref" items="${prefIter}">
<tr>
<td>
<input type="checkbox" name="pref_remove_id" value="<c:out value="${pref.name}"/>"/>
</td>
<td>
<c:out value="${pref.name}"/>
<input type="hidden" name="pref_edit_id" value="<c:out value="${pref.name}"/>"/>
</td>
<td>
<table>
<c:forEach var="value" items="${pref.values}" varStatus="status">
<tr>
<td>
<input type="text" name="<c:out value="${pref.name}"/>:<c:out value="${status.index}"/>" value="<c:out value="${value}"/>"/>
</td>
</tr>
</c:forEach>
</table>
</tr>
</tr>
</c:forEach>
</table>
<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_preference'"/>
<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_preference'"/>
</form>
<hr />
<form action="<c:out value="${edit_preferenece_link}"/>">
<input type="hidden" name="portlet_action" value="portlet.add_preference"/>
<table>
<tr>
<td>
<fmt:message key="pam.details.name"/>
</td>
<td>
<input type="text" name="name"/>
</td>
<%--TODO add combo box of existing keys--%>
</tr>
<tr>
<td>
<fmt:message key="pam.details.value"/>
</td>
<td>
<input type="text" name="value"/>
</td>
</tr>
<%--
<tr>
<td>
<fmt:message key="pam.details.type"/>
</td>
<td>
<select>
<option value="string">String</option>
<option value="int">Int</option>
</select>
</td>
</tr>
--%>
</table>
<input type="submit" value="<fmt:message key="pam.details.add_preference"/>"/>
</form>
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_languages'}">
<c:set var="langSet" value="${selectedPDef.languageSet}"/>
<table>
<tr>
<th> </th>
<th><fmt:message key="pam.details.title"/></th>
<th><fmt:message key="pam.details.short_title"/></th>
<th><fmt:message key="pam.details.keyword"/></th>
<th><fmt:message key="pam.details.locale"/></th>
</tr>
<c:forEach var="lang" items="${langSet.innerCollection}" varStatus="status">
<tr>
<td>
<input type="checkbox" name="language_remove_id" value="<c:out value="${status.index}"/>"/>
</td>
<td>
<c:out value="${lang.title}"/>
</td>
<td>
<c:out value="${lang.shortTitle}"/>
</td>
<td>
<table>
<c:forEach var="keyword" items="${lang.keywords}">
<tr>
<td>
<c:out value="${keyword}"/>
</td>
</tr>
</c:forEach>
</table>
</td>
<td>
<c:out value="${lang.locale}"/>
</td>
</tr>
</c:forEach>
</table>
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_parameters'}">
<c:set var="paramSet" value="${selectedPDef.initParameterSet}"/>
<%--
TODO: if needed, place iterator into page context
see prefs section
--%>
<c:forEach var="theparam" items="${paramSet.innerCollection}">
<c:out value="${theparam.name}"/> | <c:out value="${theparam.value}"/> <br />
</c:forEach>
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_security'}">
<c:set var="roleSet" value="${selectedPDef.initSecurityRoleRefSet}"/>
<c:forEach var="therole" items="${roleSet.innerCollection}">
<c:out value="${therole.roleName}"/> <br />
</c:forEach>
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_content_type'}">
<c:set var="contentTypeSet" value="${selectedPDef.contentTypeSet}"/>
<c:forEach var="contentType" items="${contentTypeSet.innerCollection}">
<c:out value="${contentType.contentType}"/> |
<c:forEach var="mode" items="${contentType.portletModes}">
<c:out value="${mode}"/>,
</c:forEach>
<br />
</c:forEach>
</c:if>
\ No newline at end of file
+<%--
Copyright 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.
--%>
<c:set var="portlet_tabs" value="${requestScope.portlet_tabs}"/>
<c:set var="selectedPortletTab" value="${requestScope.selected_portlet_tab}"/>
<span class="portlet-section-header">Selected Portlet</span>
<c:out value="${selectedPDef.name}"/>
<div id="portlet_tabs">
<c:set var="tab_items" value="${portlet_tabs}"/>
<c:set var="currentTab" value="${selectedPortletTab}"/>
<c:set var="url_param_name" value="selected_portlet_tab"/>
<%@ include file="tabs.jsp"%>
</div>
<br />
<c:if test="${selectedPortletTab.id == 'pd_details'}">
<table>
<tr>
<td>
<fmt:message key="pam.details.expiration_cache"/>
</td>
<td>
<c:out value="${selectedPDef.expirationCache}"/>
</td>
</tr>
</tr>
<td>
<fmt:message key="pam.details.id"/>
</td>
<td>
<c:out value="${selectedPDef.portletIdentifier}"/>
</td>
</tr>
</tr>
<td>
<fmt:message key="pam.details.unique_name"/>
</td>
<td>
<c:out value="${selectedPDef.uniqueName}"/>
</td>
</tr>
</tr>
<td>
<fmt:message key="pam.details.preference_validator"/>
</td>
<td>
<c:out value="${selectedPDef.preferenceValidatorClassname}"/>
</td>
</tr>
</tr>
<td>
<fmt:message key="pam.details.class_name"/>
</td>
<td>
<c:out value="${selectedPDef.className}"/>
</td>
</tr>
</table>
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_metadata'}">
<div id="portlet_metadata">
<c:set var="md" value="${selectedPDef.metadata}"/>
<c:set var="action_prefix" value="portlet."/>
<portlet:actionURL var="edit_metadata_link" >
</portlet:actionURL>
<%@ include file="metadata-detail.jsp" %>
</div>
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_preferences'}">
<c:set var="prefSet" value="${selectedPDef.preferenceSet}"/>
<%
PreferenceSetComposite comp = (PreferenceSetComposite)pageContext.findAttribute("prefSet");
Iterator prefIter = comp.iterator();
pageContext.setAttribute("prefIter", prefIter);
%>
<portlet:actionURL var="edit_preferenece_link" >
</portlet:actionURL>
<form action="<c:out value="${edit_preferenece_link}"/>">
<input type="hidden" name="portlet_action" value=""/>
<table border="1">
<tr>
<th> </th>
<th><fmt:message key="pam.details.name"/></th>
<th><fmt:message key="pam.details.value"/></th>
</tr>
<tr>
<td colspan="3"> </td>
</td>
<c:forEach var="pref" items="${prefIter}">
<tr>
<td>
<input type="checkbox" name="pref_remove_id" value="<c:out value="${pref.name}"/>"/>
</td>
<td>
<c:out value="${pref.name}"/>
<input type="hidden" name="pref_edit_id" value="<c:out value="${pref.name}"/>"/>
</td>
<td>
<table>
<c:forEach var="value" items="${pref.values}" varStatus="status">
<tr>
<td>
<input type="text" name="<c:out value="${pref.name}"/>:<c:out value="${status.index}"/>" value="<c:out value="${value}"/>"/>
</td>
</tr>
</c:forEach>
</table>
</tr>
</tr>
</c:forEach>
</table>
<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_preference'"/>
<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_preference'"/>
</form>
<hr />
<form action="<c:out value="${edit_preferenece_link}"/>">
<input type="hidden" name="portlet_action" value="portlet.add_preference"/>
<table>
<tr>
<td>
<fmt:message key="pam.details.name"/>
</td>
<td>
<input type="text" name="name"/>
</td>
<%--TODO add combo box of existing keys--%>
</tr>
<tr>
<td>
<fmt:message key="pam.details.value"/>
</td>
<td>
<input type="text" name="value"/>
</td>
</tr>
<%--
<tr>
<td>
<fmt:message key="pam.details.type"/>
</td>
<td>
<select>
<option value="string">String</option>
<option value="int">Int</option>
</select>
</td>
</tr>
--%>
</table>
<input type="submit" value="<fmt:message key="pam.details.add_preference"/>"/>
</form>
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_languages'}">
<c:set var="langSet" value="${selectedPDef.languageSet}"/>
<portlet:actionURL var="edit_language_link" >
</portlet:actionURL>
<form action="<c:out value="${edit_language_link}"/>">
<input type="hidden" name="portlet_action" value=""/>
<table border="1">
<tr>
<th> </th>
<th><fmt:message key="pam.details.title"/></th>
<th><fmt:message key="pam.details.short_title"/></th>
<th><fmt:message key="pam.details.keyword"/></th>
<th><fmt:message key="pam.details.locale"/></th>
</tr>
<c:forEach var="lang" items="${langSet.innerCollection}" varStatus="status">
<tr>
<td>
<input type="checkbox" name="language_remove_id" value="<c:out value="${status.index}"/>"/>
<input type="hidden" name="language_edit_id" value="<c:out value="${status.index}"/>"/>
</td>
<td>
<input type="text" name="title:<c:out value="${status.index}"/>" value="<c:out value="${lang.title}"/>"/>
</td>
<td>
<input type="text" name="short_title:<c:out value="${status.index}"/>" value="<c:out value="${lang.shortTitle}"/>"/>
</td>
<td>
<table>
<c:forEach var="keyword" items="${lang.keywords}" varStatus="keywordStatus">
<tr>
<td>
<input type="text" name="keyword:<c:out value="${status.index}"/>:<c:out value="${keywordStatus.index}"/>" value="<c:out value="${keyword}"/>"/>
</td>
</tr>
</c:forEach>
</table>
<%--
<input type="text" name="keyword:<c:out value="${status.index}"/>" value="<c:forEach var="keyword" items="${lang.keywords}" varStatus="keywordStatus"><c:out value="${keyword}"/>,</c:forEach>"/>
--%>
</td>
<td>
<c:out value="${lang.locale}"/>
</td>
</tr>
</c:forEach>
</table>
<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_language'"/>
<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_language'"/>
</form>
<form action="<c:out value="${edit_language_link}"/>">
<input type="hidden" name="portlet_action" value="portlet.add_language"/>
<table>
<tr>
<td>
<fmt:message key="pam.details.title"/>
</td>
<td>
<input type="text" name="title" value=""/>
</td>
</tr>
<tr>
<td>
<fmt:message key="pam.details.short_title"/>
</td>
<td>
<input type="text" name="short_title" value=""/>
</td>
</tr>
<tr>
<td>
<fmt:message key="pam.details.keyword"/>
</td>
<td>
<input type="text" name="keyword" value=""/>
</td>
</tr>
<tr>
<td>
<fmt:message key="pam.details.locale"/>
</td>
<td>
<input type="text" name="locale" value=""/>
</td>
</tr>
</table>
<input type="submit" value="<fmt:message key="pam.details.add_language"/>"/>
</form>
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_parameters'}">
<c:set var="paramSet" value="${selectedPDef.initParameterSet}"/>
<%--
TODO: if needed, place iterator into page context
see prefs section
--%>
<c:forEach var="theparam" items="${paramSet.innerCollection}">
<c:out value="${theparam.name}"/> | <c:out value="${theparam.value}"/> <br />
</c:forEach>
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_security'}">
<c:set var="roleSet" value="${selectedPDef.initSecurityRoleRefSet}"/>
<c:forEach var="therole" items="${roleSet.innerCollection}">
<c:out value="${therole.roleName}"/> <br />
</c:forEach>
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_content_type'}">
<c:set var="contentTypeSet" value="${selectedPDef.contentTypeSet}"/>
<c:forEach var="contentType" items="${contentTypeSet.innerCollection}">
<c:out value="${contentType.contentType}"/> |
<c:forEach var="mode" items="${contentType.portletModes}">
<c:out value="${mode}"/>,
</c:forEach>
<br />
</c:forEach>
</c:if>
\ No newline at end of file
1.12 +2 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PortletApplicationDetail.java 10 Sep 2004 18:32:35 -0000 1.11
+++ PortletApplicationDetail.java 13 Sep 2004 20:33:22 -0000 1.12
@@ -1,9 +1,9 @@
/*
* Copyright 2000-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.portlets.pam;
-import java.io.IOException;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Locale;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletConfig;
import javax.portlet.PortletContext;
import javax.portlet.PortletException;
import javax.portlet.PortletSession;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import org.apache.jetspeed.portlet.ServletPortlet;
import org.apache.jetspeed.portlets.pam.beans.PortletApplicationBean;
import org.apache.jetspeed.portlets.pam.beans.TabBean;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.LocalizedField;
import org.apache.jetspeed.om.common.UserAttribute;
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.jetspeed.om.impl.UserAttributeImpl;
import org.apache.pluto.om.common.Preference;
import org.apache.pluto.om.portlet.PortletDefinition;
/**
* This portlet is a browser over all the portlet applications in the system.
*
* @author <a href="mailto:jford@apache.com">Jeremy Ford</a>
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
*/
public class PortletApplicationDetail extends ServletPortlet
{
private static final String PORTLET_ACTION = "portlet_action";
private final String VIEW_PA = "portletApplication";
private final String VIEW_PD = "portletDefinition";
private static final String PORTLET_APP_ACTION_PREFIX = "portlet_app.";
private static final String PORTLET_ACTION_PREFIX = "portlet.";
private PortletContext context;
private PortletRegistryComponent registry;
private LinkedHashMap paTabMap = new LinkedHashMap();
private LinkedHashMap pdTabMap = new LinkedHashMap();
public void init(PortletConfig config)
throws PortletException
{
super.init(config);
context = getPortletContext();
registry = (PortletRegistryComponent)context.getAttribute(PortletApplicationResources.CPS_REGISTRY_COMPONENT);
if (null == registry)
{
throw new PortletException("Failed to find the Portlet Registry on portlet initialization");
}
TabBean tb1 = new TabBean("pa_details");
TabBean tb2 = new TabBean("pa_metadata");
TabBean tb3 = new TabBean("pa_portlets");
TabBean tb4 = new TabBean("pa_user_attribtues");
paTabMap.put(tb1.getId(), tb1);
paTabMap.put(tb2.getId(), tb2);
paTabMap.put(tb3.getId(), tb3);
paTabMap.put(tb4.getId(), tb4);
TabBean tb_1 = new TabBean("pd_details");
TabBean tb_2 = new TabBean("pd_metadata");
TabBean tb_3 = new TabBean("pd_preferences");
TabBean tb_4 = new TabBean("pd_languages");
TabBean tb_5 = new TabBean("pd_parameters");
TabBean tb_6 = new TabBean("pd_security");
TabBean tb_7 = new TabBean("pd_content_type");
pdTabMap.put(tb_1.getId(), tb_1);
pdTabMap.put(tb_2.getId(), tb_2);
pdTabMap.put(tb_3.getId(), tb_3);
pdTabMap.put(tb_4.getId(), tb_4);
pdTabMap.put(tb_5.getId(), tb_5);
pdTabMap.put(tb_6.getId(), tb_6);
pdTabMap.put(tb_7.getId(), tb_7);
}
public void doView(RenderRequest request, RenderResponse response)
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Locale;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletConfig;
import javax.portlet.PortletContext;
import javax.portlet.PortletException;
import javax.portlet.PortletSession;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import org.apache.jetspeed.portlet.ServletPortlet;
import org.apache.jetspeed.portlets.pam.beans.PortletApplicationBean;
import org.apache.jetspeed.portlets.pam.beans.TabBean;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.LocalizedField;
import org.apache.jetspeed.om.common.MutableLanguage;
import org.apache.jetspeed.om.common.UserAttribute;
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.jetspeed.om.impl.LanguageImpl;
import org.apache.jetspeed.om.impl.UserAttributeImpl;
import org.apache.pluto.om.portlet.PortletDefinition;
/**
* This portlet is a browser over all the portlet applications in the system.
*
* @author <a href="mailto:jford@apache.com">Jeremy Ford</a>
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
*/
public class PortletApplicationDetail extends ServletPortlet
{
private static final String PORTLET_ACTION = "portlet_action";
private final String VIEW_PA = "portletApplication";
private final String VIEW_PD = "portletDefinition";
private static final String PORTLET_APP_ACTION_PREFIX = "portlet_app.";
private static final String PORTLET_ACTION_PREFIX = "portlet.";
private PortletContext context;
private PortletRegistryComponent registry;
private LinkedHashMap paTabMap = new LinkedHashMap();
private LinkedHashMap pdTabMap = new LinkedHashMap();
public void init(PortletConfig config)
throws PortletException
{
super.init(config);
context = getPortletContext();
registry = (PortletRegistryComponent)context.getAttribute(PortletApplicationResources.CPS_REGISTRY_COMPONENT);
if (null == registry)
{
throw new PortletException("Failed to find the Portlet Registry on portlet initialization");
}
TabBean tb1 = new TabBean("pa_details");
TabBean tb2 = new TabBean("pa_metadata");
TabBean tb3 = new TabBean("pa_portlets");
TabBean tb4 = new TabBean("pa_user_attribtues");
paTabMap.put(tb1.getId(), tb1);
paTabMap.put(tb2.getId(), tb2);
paTabMap.put(tb3.getId(), tb3);
paTabMap.put(tb4.getId(), tb4);
TabBean tb_1 = new TabBean("pd_details");
TabBean tb_2 = new TabBean("pd_metadata");
TabBean tb_3 = new TabBean("pd_preferences");
TabBean tb_4 = new TabBean("pd_languages");
TabBean tb_5 = new TabBean("pd_parameters");
TabBean tb_6 = new TabBean("pd_security");
TabBean tb_7 = new TabBean("pd_content_type");
pdTabMap.put(tb_1.getId(), tb_1);
pdTabMap.put(tb_2.getId(), tb_2);
pdTabMap.put(tb_3.getId(), tb_3);
pdTabMap.put(tb_4.getId(), tb_4);
pdTabMap.put(tb_5.getId(), tb_5);
pdTabMap.put(tb_6.getId(), tb_6);
pdTabMap.put(tb_7.getId(), tb_7);
}
public void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException
{
response.setContentType("text/html");
MutablePortletApplication pa = (MutablePortletApplication)
request.getPortletSession().getAttribute(PortletApplicationResources.PAM_CURRENT_PA,
PortletSession.APPLICATION_SCOPE);
if (null != pa)
{
request.setAttribute(VIEW_PA, new PortletApplicationBean(pa));
PortletDefinition pdef = (PortletDefinition) request.getPortletSession().getAttribute(PortletApplicationResources.REQUEST_SELECT_PORTLET, PortletSession.APPLICATION_SCOPE);
request.setAttribute(VIEW_PD, pdef);
request.setAttribute("tabs", paTabMap.values());
request.setAttribute("portlet_tabs", pdTabMap.values());
TabBean selectedTab = (TabBean) request.getPortletSession().getAttribute(PortletApplicationResources.REQUEST_SELECT_TAB, PortletSession.APPLICATION_SCOPE);
if(selectedTab == null)
{
selectedTab = (TabBean) paTabMap.values().iterator().next();
}
//this supports tabs for portlets
if(selectedTab.getId().equals("pa_portlets"))
{
TabBean selectedPortletTab = (TabBean) request.getPortletSession().getAttribute("selected_portlet_tab");
if(selectedPortletTab == null)
{
selectedPortletTab = (TabBean) pdTabMap.values().iterator().next();
}
request.setAttribute("selected_portlet_tab", selectedPortletTab);
}
request.setAttribute(PortletApplicationResources.REQUEST_SELECT_TAB, selectedTab);
}
super.doView(request, response);
}
-
public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException
{
//System.out.println("PorletApplicationDetail: processAction()");
MutablePortletApplication pa = (MutablePortletApplication)
actionRequest.getPortletSession().getAttribute(PortletApplicationResources.PAM_CURRENT_PA,
PortletSession.APPLICATION_SCOPE);
String selectedPortlet = actionRequest.getParameter(PortletApplicationResources.REQUEST_SELECT_PORTLET);
if(selectedPortlet != null)
{
PortletDefinition pdef = pa.getPortletDefinitionByName(selectedPortlet);
actionRequest.getPortletSession().setAttribute(PortletApplicationResources.REQUEST_SELECT_PORTLET, pdef, PortletSession.APPLICATION_SCOPE);
}
String selectedTab = actionRequest.getParameter(PortletApplicationResources.REQUEST_SELECT_TAB);
if(selectedTab != null)
{
TabBean tab = (TabBean) paTabMap.get(selectedTab);
actionRequest.getPortletSession().setAttribute(PortletApplicationResources.REQUEST_SELECT_TAB, tab, PortletSession.APPLICATION_SCOPE);
}
String selectedPortletTab = actionRequest.getParameter("selected_portlet_tab");
if(selectedPortletTab != null)
{
TabBean tab = (TabBean) pdTabMap.get(selectedPortletTab);
actionRequest.getPortletSession().setAttribute("selected_portlet_tab", tab);
}
String action = actionRequest.getParameter(PORTLET_ACTION);
if(action != null)
{
if(isAppAction(action))
{
action = getAction(PORTLET_APP_ACTION_PREFIX, action);
if(action.endsWith("metadata"))
{
processMetadataAction(actionRequest, actionResponse, pa.getMetadata(), action);
}
else if(action.endsWith("user_attribute"))
{
processUserAttributeAction(actionRequest, actionResponse, pa, action);
}
}
else if(isPortletAction(action))
{
action = getAction(PORTLET_ACTION_PREFIX, action);
PortletDefinitionComposite pdef = (PortletDefinitionComposite) actionRequest.getPortletSession().getAttribute(PortletApplicationResources.REQUEST_SELECT_PORTLET, PortletSession.APPLICATION_SCOPE);
if(action.endsWith("metadata"))
{
processMetadataAction(actionRequest, actionResponse, pdef.getMetadata(), action);
}
else if(action.endsWith("portlet"))
{
processPortletAction(actionRequest, actionResponse, pa, pdef, action);
}
else if(action.endsWith("preference"))
{
processPreferenceAction(actionRequest, actionResponse, pa, pdef, action);
}
}
}
}
private boolean isAppAction(String action)
{
return action.startsWith(PORTLET_APP_ACTION_PREFIX);
}
private boolean isPortletAction(String action)
{
return action.startsWith(PORTLET_ACTION_PREFIX);
}
private String getAction(String prefix, String action)
{
return action.substring(prefix.length());
}
/**
* @param actionRequest
* @param actionResponse
* @param pa
* @param action
*/
private void processUserAttributeAction(ActionRequest actionRequest, ActionResponse actionResponse, MutablePortletApplication pa, String action) throws PortletException, IOException
{
if(action.equals("edit_user_attribute"))
{
registry.getPersistenceStore().getTransaction().begin();
Iterator userAttrIter = pa.getUserAttributes().iterator();
while (userAttrIter.hasNext())
{
UserAttribute userAttr = (UserAttribute) userAttrIter.next();
String userAttrName = userAttr.getName();
String description = actionRequest.getParameter(userAttrName + ":description");
if(!userAttr.getDescription().equals(description))
{
userAttr.setDescription(description);
}
}
registry.getPersistenceStore().getTransaction().commit();
}
else if(action.equals("add_user_attribute"))
{
String userAttrName = actionRequest.getParameter("user_attr_name");
String userAttrDesc = actionRequest.getParameter("user_attr_desc");
if(userAttrName != null)
{
registry.getPersistenceStore().getTransaction().begin();
//TODO: should this come from a factory??
UserAttribute userAttribute = new UserAttributeImpl();
userAttribute.setName(userAttrName);
userAttribute.setDescription(userAttrDesc);
pa.addUserAttribute(userAttribute);
registry.getPersistenceStore().getTransaction().commit();
}
}
else if(action.equals("remove_user_attribute"))
{
String[] userAttrNames = actionRequest.getParameterValues("user_attr_id");
if(userAttrNames != null)
{
registry.getPersistenceStore().getTransaction().begin();
Iterator userAttrIter = pa.getUserAttributes().iterator();
while (userAttrIter.hasNext())
{
UserAttribute userAttr = (UserAttribute) userAttrIter.next();
for(int i=0; i<userAttrNames.length; i++)
{
String userAttrName = userAttrNames[i];
if(userAttr.getName().equals(userAttrName))
{
userAttrIter.remove();
break;
}
}
}
registry.getPersistenceStore().getTransaction().commit();
}
}
}
/**
* @param actionRequest
* @param actionResponse
* @param pa
* @param action
* @throws PortletException
* @throws IOException
*/
private void processMetadataAction(ActionRequest actionRequest, ActionResponse actionResponse, GenericMetadata md, String action) throws PortletException, IOException
{
if(action.equals("edit_metadata"))
{
Iterator fieldsIter = md.getFields().iterator();
registry.getPersistenceStore().getTransaction().begin();
while (fieldsIter.hasNext())
{
LocalizedField field = (LocalizedField) fieldsIter.next();
String id = field.getId().toString();
String value = actionRequest.getParameter(id + ":value");
if(value != null)
{
if(!value.equals(field.getValue()))
{
field.setValue(value);
}
}
}
registry.getPersistenceStore().getTransaction().commit();
}
else if(action.equals("remove_metadata"))
{
Iterator fieldsIter = md.getFields().iterator();
String[] ids = actionRequest.getParameterValues("metadata_id");
if(ids != null)
{
registry.getPersistenceStore().getTransaction().begin();
while (fieldsIter.hasNext())
{
LocalizedField field = (LocalizedField) fieldsIter.next();
String id = field.getId().toString();
for(int i=0; i<ids.length; i++)
{
String mid = ids[i];
if(mid.equals(id))
{
fieldsIter.remove();
break;
}
}
}
}
registry.getPersistenceStore().getTransaction().commit();
}
else if(action.equals("add_metadata"))
{
PersistenceStore store = registry.getPersistenceStore();
System.out.println("Transcation is open: " + store.getTransaction().isOpen());
store.getTransaction().begin();
System.out.println("Transcation is open: " + store.getTransaction().isOpen());
String name = actionRequest.getParameter("name");
String value = actionRequest.getParameter("value");
String localeParam = actionRequest.getParameter("locale");
if(localeParam == null)
{
localeParam = "en"; //need to default better
}
Locale locale = new Locale(localeParam);
md.addField(locale, name, value);
store.getTransaction().commit();
}
}
private void processPortletAction(ActionRequest actionRequest, ActionResponse actionResponse, MutablePortletApplication pa, PortletDefinitionComposite portlet, String action) throws PortletException, IOException
{
if(action.equals("edit_portlet"))
{
}
else if(action.equals("remove_portlet"))
{
//TODO should this be allowed??
}
else if(action.equals("add_portlet"))
{
//TODO should this be allowed??
}
}
/**
* @param actionRequest
* @param actionResponse
* @param pa
* @param pdef
* @param action
*/
private void processPreferenceAction(ActionRequest actionRequest, ActionResponse actionResponse, MutablePortletApplication pa, PortletDefinitionComposite portlet, String action)
{
if(action.equals("add_preference"))
{
registry.getPersistenceStore().getTransaction().begin();
String name = actionRequest.getParameter("name");
String value = actionRequest.getParameter("value");
PreferenceComposite pref = (PreferenceComposite) portlet.getPreferenceSet().get(name);
if(pref == null)
{
portlet.addPreference(name, new String[] { value });
}
else
{
pref.addValue(value);
}
registry.getPersistenceStore().getTransaction().commit();
}
else if(action.equals("edit_preference"))
{
registry.getPersistenceStore().getTransaction().begin();
String[] prefNames = actionRequest.getParameterValues("pref_edit_id");
for (int i = 0; i < prefNames.length; i++)
{
String prefName = prefNames[i];
PreferenceComposite prefComp = (PreferenceComposite) portlet.getPreferenceSet().get(prefName);
String[] values = prefComp.getValueArray();
for (int j = 0; j < values.length; j++)
{
String value = values[j];
String newValue = actionRequest.getParameter(prefName + ":" + j);
if(!value.equals(newValue))
{
prefComp.setValueAt(j, newValue);
}
}
}
registry.getPersistenceStore().getTransaction().commit();
}
else if(action.equals("remove_preference"))
{
registry.getPersistenceStore().getTransaction().begin();
String[] prefNames = actionRequest.getParameterValues("pref_remove_id");
Iterator prefIter = portlet.getPreferenceSet().iterator();
while (prefIter.hasNext())
{
PreferenceComposite pref = (PreferenceComposite) prefIter.next();
String name = pref.getName();
for(int i=0; i<prefNames.length; i++)
{
String prefName = prefNames[i];
if(name.equals(prefName))
{
prefIter.remove();
break;
}
}
}
registry.getPersistenceStore().getTransaction().commit();
}
}
+
public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException
{
//System.out.println("PorletApplicationDetail: processAction()");
MutablePortletApplication pa = (MutablePortletApplication)
actionRequest.getPortletSession().getAttribute(PortletApplicationResources.PAM_CURRENT_PA,
PortletSession.APPLICATION_SCOPE);
String selectedPortlet = actionRequest.getParameter(PortletApplicationResources.REQUEST_SELECT_PORTLET);
if(selectedPortlet != null)
{
PortletDefinition pdef = pa.getPortletDefinitionByName(selectedPortlet);
actionRequest.getPortletSession().setAttribute(PortletApplicationResources.REQUEST_SELECT_PORTLET, pdef, PortletSession.APPLICATION_SCOPE);
}
String selectedTab = actionRequest.getParameter(PortletApplicationResources.REQUEST_SELECT_TAB);
if(selectedTab != null)
{
TabBean tab = (TabBean) paTabMap.get(selectedTab);
actionRequest.getPortletSession().setAttribute(PortletApplicationResources.REQUEST_SELECT_TAB, tab, PortletSession.APPLICATION_SCOPE);
}
String selectedPortletTab = actionRequest.getParameter("selected_portlet_tab");
if(selectedPortletTab != null)
{
TabBean tab = (TabBean) pdTabMap.get(selectedPortletTab);
actionRequest.getPortletSession().setAttribute("selected_portlet_tab", tab);
}
String action = actionRequest.getParameter(PORTLET_ACTION);
if(action != null)
{
if(isAppAction(action))
{
action = getAction(PORTLET_APP_ACTION_PREFIX, action);
if(action.endsWith("metadata"))
{
processMetadataAction(actionRequest, actionResponse, pa.getMetadata(), action);
}
else if(action.endsWith("user_attribute"))
{
processUserAttributeAction(actionRequest, actionResponse, pa, action);
}
}
else if(isPortletAction(action))
{
action = getAction(PORTLET_ACTION_PREFIX, action);
PortletDefinitionComposite pdef = (PortletDefinitionComposite) actionRequest.getPortletSession().getAttribute(PortletApplicationResources.REQUEST_SELECT_PORTLET, PortletSession.APPLICATION_SCOPE);
if(action.endsWith("metadata"))
{
processMetadataAction(actionRequest, actionResponse, pdef.getMetadata(), action);
}
else if(action.endsWith("portlet"))
{
processPortletAction(actionRequest, actionResponse, pa, pdef, action);
}
else if(action.endsWith("preference"))
{
processPreferenceAction(actionRequest, actionResponse, pa, pdef, action);
}
else if(action.endsWith("language"))
{
processLanguage(actionRequest, actionResponse, pa, pdef, action);
}
}
}
}
private boolean isAppAction(String action)
{
return action.startsWith(PORTLET_APP_ACTION_PREFIX);
}
private boolean isPortletAction(String action)
{
return action.startsWith(PORTLET_ACTION_PREFIX);
}
private String getAction(String prefix, String action)
{
return action.substring(prefix.length());
}
/**
* @param actionRequest
* @param actionResponse
* @param pa
* @param action
*/
private void processUserAttributeAction(ActionRequest actionRequest, ActionResponse actionResponse, MutablePortletApplication pa, String action) throws PortletException, IOException
{
if(action.equals("edit_user_attribute"))
{
registry.getPersistenceStore().getTransaction().begin();
Iterator userAttrIter = pa.getUserAttributes().iterator();
while (userAttrIter.hasNext())
{
UserAttribute userAttr = (UserAttribute) userAttrIter.next();
String userAttrName = userAttr.getName();
String description = actionRequest.getParameter(userAttrName + ":description");
if(!userAttr.getDescription().equals(description))
{
userAttr.setDescription(description);
}
}
registry.getPersistenceStore().getTransaction().commit();
}
else if(action.equals("add_user_attribute"))
{
String userAttrName = actionRequest.getParameter("user_attr_name");
String userAttrDesc = actionRequest.getParameter("user_attr_desc");
if(userAttrName != null)
{
registry.getPersistenceStore().getTransaction().begin();
//TODO: should this come from a factory??
UserAttribute userAttribute = new UserAttributeImpl();
userAttribute.setName(userAttrName);
userAttribute.setDescription(userAttrDesc);
pa.addUserAttribute(userAttribute);
registry.getPersistenceStore().getTransaction().commit();
}
}
else if(action.equals("remove_user_attribute"))
{
String[] userAttrNames = actionRequest.getParameterValues("user_attr_id");
if(userAttrNames != null)
{
registry.getPersistenceStore().getTransaction().begin();
Iterator userAttrIter = pa.getUserAttributes().iterator();
while (userAttrIter.hasNext())
{
UserAttribute userAttr = (UserAttribute) userAttrIter.next();
for(int i=0; i<userAttrNames.length; i++)
{
String userAttrName = userAttrNames[i];
if(userAttr.getName().equals(userAttrName))
{
userAttrIter.remove();
break;
}
}
}
registry.getPersistenceStore().getTransaction().commit();
}
}
}
/**
* @param actionRequest
* @param actionResponse
* @param pa
* @param action
* @throws PortletException
* @throws IOException
*/
private void processMetadataAction(ActionRequest actionRequest, ActionResponse actionResponse, GenericMetadata md, String action) throws PortletException, IOException
{
if(action.equals("edit_metadata"))
{
Iterator fieldsIter = md.getFields().iterator();
registry.getPersistenceStore().getTransaction().begin();
while (fieldsIter.hasNext())
{
LocalizedField field = (LocalizedField) fieldsIter.next();
String id = field.getId().toString();
String value = actionRequest.getParameter(id + ":value");
if(value != null)
{
if(!value.equals(field.getValue()))
{
field.setValue(value);
}
}
}
registry.getPersistenceStore().getTransaction().commit();
}
else if(action.equals("remove_metadata"))
{
Iterator fieldsIter = md.getFields().iterator();
String[] ids = actionRequest.getParameterValues("metadata_id");
if(ids != null)
{
registry.getPersistenceStore().getTransaction().begin();
while (fieldsIter.hasNext())
{
LocalizedField field = (LocalizedField) fieldsIter.next();
String id = field.getId().toString();
for(int i=0; i<ids.length; i++)
{
String mid = ids[i];
if(mid.equals(id))
{
fieldsIter.remove();
break;
}
}
}
}
registry.getPersistenceStore().getTransaction().commit();
}
else if(action.equals("add_metadata"))
{
PersistenceStore store = registry.getPersistenceStore();
System.out.println("Transcation is open: " + store.getTransaction().isOpen());
store.getTransaction().begin();
System.out.println("Transcation is open: " + store.getTransaction().isOpen());
String name = actionRequest.getParameter("name");
String value = actionRequest.getParameter("value");
String localeParam = actionRequest.getParameter("locale");
if(localeParam == null)
{
localeParam = "en"; //need to default better
}
Locale locale = new Locale(localeParam);
md.addField(locale, name, value);
store.getTransaction().commit();
}
}
private void processPortletAction(ActionRequest actionRequest, ActionResponse actionResponse, MutablePortletApplication pa, PortletDefinitionComposite portlet, String action) throws PortletException, IOException
{
if(action.equals("edit_portlet"))
{
}
else if(action.equals("remove_portlet"))
{
//TODO should this be allowed??
}
else if(action.equals("add_portlet"))
{
//TODO should this be allowed??
}
}
/**
* @param actionRequest
* @param actionResponse
* @param pa
* @param pdef
* @param action
*/
private void processPreferenceAction(ActionRequest actionRequest, ActionResponse actionResponse, MutablePortletApplication pa, PortletDefinitionComposite portlet, String action)
{
if(action.equals("add_preference"))
{
registry.getPersistenceStore().getTransaction().begin();
String name = actionRequest.getParameter("name");
String value = actionRequest.getParameter("value");
PreferenceComposite pref = (PreferenceComposite) portlet.getPreferenceSet().get(name);
if(pref == null)
{
portlet.addPreference(name, new String[] { value });
}
else
{
pref.addValue(value);
}
registry.getPersistenceStore().getTransaction().commit();
}
else if(action.equals("edit_preference"))
{
registry.getPersistenceStore().getTransaction().begin();
String[] prefNames = actionRequest.getParameterValues("pref_edit_id");
for (int i = 0; i < prefNames.length; i++)
{
String prefName = prefNames[i];
PreferenceComposite prefComp = (PreferenceComposite) portlet.getPreferenceSet().get(prefName);
String[] values = prefComp.getValueArray();
for (int j = 0; j < values.length; j++)
{
String value = values[j];
String newValue = actionRequest.getParameter(prefName + ":" + j);
if(!value.equals(newValue))
{
prefComp.setValueAt(j, newValue);
}
}
}
registry.getPersistenceStore().getTransaction().commit();
}
else if(action.equals("remove_preference"))
{
registry.getPersistenceStore().getTransaction().begin();
String[] prefNames = actionRequest.getParameterValues("pref_remove_id");
Iterator prefIter = portlet.getPreferenceSet().iterator();
while (prefIter.hasNext())
{
PreferenceComposite pref = (PreferenceComposite) prefIter.next();
String name = pref.getName();
for(int i=0; i<prefNames.length; i++)
{
String prefName = prefNames[i];
if(name.equals(prefName))
{
prefIter.remove();
break;
}
}
}
registry.getPersistenceStore().getTransaction().commit();
}
}
/**
* @param actionRequest
* @param actionResponse
* @param pa
* @param pdef
* @param action
*/
private void processLanguage(ActionRequest actionRequest, ActionResponse actionResponse, MutablePortletApplication pa, PortletDefinitionComposite portlet, String action)
{
if(action.equals("add_language"))
{
registry.getPersistenceStore().getTransaction().begin();
String title = actionRequest.getParameter("title");
String shortTitle = actionRequest.getParameter("short_title");
String keywords = actionRequest.getParameter("keyword");
String locale = actionRequest.getParameter("locale");
LanguageImpl language = new LanguageImpl();
language.setTitle(title);
language.setShortTitle(shortTitle);
language.setKeywords(keywords);
language.setLocale(new Locale(locale));
portlet.addLanguage(language);
registry.getPersistenceStore().getTransaction().commit();
}
else if(action.equals("remove_language"))
{
String[] removeIds = actionRequest.getParameterValues("language_remove_id");
if(removeIds != null)
{
registry.getPersistenceStore().getTransaction().begin();
int id = 0;
Iterator langIter = portlet.getLanguageSet().iterator();
while (langIter.hasNext())
{
langIter.next();
int currentId = id++;
for(int i=0; i<removeIds.length; i++)
{
String removeId = removeIds[i];
String tempId = "" + currentId;
if(removeId.equals(tempId))
{
langIter.remove();
break;
}
}
}
registry.getPersistenceStore().getTransaction().commit();
}
}
else if(action.equals("edit_language"))
{
String[] editIds = actionRequest.getParameterValues("language_edit_id");
if(editIds != null)
{
registry.getPersistenceStore().getTransaction().begin();
//technically, the size and set of edit ids should be
//equal to the size and set of the language set
int id = 0;
Iterator langIter = portlet.getLanguageSet().iterator();
while (langIter.hasNext())
{
String title = actionRequest.getParameter("title:" + id);
String shortTitle = actionRequest.getParameter("short_title:" + id);
//must cast to interface to avoid class loader issues
MutableLanguage lang = (MutableLanguage) langIter.next();
if(!lang.getTitle().equals(title))
{
lang.setTitle(title);
}
//TODO: is there a better way to do this?
//setting the keywords like this will cause all the old keywords
//to be delted from the db and re-inserted
Iterator keywordIter = lang.getKeywords();
int keywordIndex = 0;
ArrayList keywordList = new ArrayList();
while (keywordIter.hasNext())
{
String keyword = (String) keywordIter.next();
String keywordParam = actionRequest.getParameter("keyword:" + id + ":" + keywordIndex);
if(keywordParam != null && keywordParam.length() > 0)
{
keywordList.add(keywordParam);
}
keywordIndex++;
}
lang.setKeywords(keywordList);
if(!lang.getShortTitle().equals(shortTitle))
{
lang.setShortTitle(shortTitle);
}
registry.getPersistenceStore().getTransaction().commit();
}
}
}
}
}
1.2 +8 -2 jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/resources/PAMResources_ja.properties
Index: PAMResources_ja.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/resources/PAMResources_ja.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PAMResources_ja.properties 10 Sep 2004 23:43:58 -0000 1.1
+++ PAMResources_ja.properties 13 Sep 2004 20:33:22 -0000 1.2
@@ -30,8 +30,10 @@
pam.details.remove=\u9078\u629E\u3057\u305F\u3082\u306E\u3092\u524A\u9664
pam.details.add_user_attribute=\u30E6\u30FC\u30B6\u30FC\u5C5E\u6027\u306E\u8FFD\u52A0
-##Metadata view
pam.details.locale=\u30ED\u30B1\u30FC\u30EB
+pam.details.locale.description=A valid 2 letter country code
+
+##Metadata view
pam.details.add_metadata=\u30E1\u30BF\u30C7\u30FC\u30BF\u306E\u8FFD\u52A0
##Portlet view
@@ -47,6 +49,10 @@
pam.details.title=\u30BF\u30A4\u30C8\u30EB
pam.details.short_title=\u77ED\u3044\u30BF\u30A4\u30C8\u30EB
pam.details.keyword=\u30AD\u30FC\u30EF\u30FC\u30C9
+pam.details.title.description=Title to appear in title bar
+pam.details.short_title.description=A short descriptive title
+pam.details.keyword.description=Comma delimited list of keywords
+pam.details.add_language=Add Language
##Portlet Application Tabs
pam.details.tabs.pa_details=\u8A73\u7D30
1.4 +9 -2 jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/resources/PAMResources.properties
Index: PAMResources.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/resources/PAMResources.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PAMResources.properties 10 Sep 2004 21:45:41 -0000 1.3
+++ PAMResources.properties 13 Sep 2004 20:33:22 -0000 1.4
@@ -30,8 +30,11 @@
pam.details.remove=Remove Selected
pam.details.add_user_attribute=Add User Attribute
-##Metadata view
+
pam.details.locale=Locale
+pam.details.locale.description=A valid 2 letter country code
+
+##Metadata view
pam.details.add_metadata=Add MetaData
##Portlet view
@@ -47,6 +50,10 @@
pam.details.title=Title
pam.details.short_title=Short Title
pam.details.keyword=Keyword
+pam.details.title.description=Title to appear in title bar
+pam.details.short_title.description=A short descriptive title
+pam.details.keyword.description=Comma delimited list of keywords
+pam.details.add_language=Add Language
##Portlet Application Tabs
pam.details.tabs.pa_details=Details
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org