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 vk...@apache.org on 2009/04/21 16:20:59 UTC
svn commit: r767156 - in
/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets:
./ security/ security/resources/ site/ site/resources/ wicket/
Author: vkumar
Date: Tue Apr 21 14:20:59 2009
New Revision: 767156
URL: http://svn.apache.org/viewvc?rev=767156&view=rev
Log:
Adding resource bundle in portal site manager and JetspeedPrincipalManagement portlet
Fixing AdminWicket portlet
Added:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/JetspeedPrincipalManagement.properties (with props)
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/JetspeedPrincipalManagement_en.properties (with props)
Removed:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewUserPrincipalProfilePanel.html
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementApplication.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$AssociationTypePanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewPrincipalPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewUserPrincipalPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalAttributesPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalCredentialsPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$UserPrincipalProfilePanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/JetspeedDocument.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerApplication.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager.properties
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager_en.properties
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/AdminPortletWebPage.java Tue Apr 21 14:20:59 2009
@@ -44,6 +44,7 @@
{
protected Map<String, String> initParams = null;
protected JetspeedServiceLocator serviceLocator;
+ public static final String USER_ADMINISTRATION = "J2 User Administration";
public AdminPortletWebPage()
{
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementApplication.java?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementApplication.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementApplication.java Tue Apr 21 14:20:59 2009
@@ -17,6 +17,7 @@
package org.apache.jetspeed.portlets.security;
import org.apache.jetspeed.portlets.wicket.AbstractAdminWebApplication;
+import org.apache.wicket.resource.loader.BundleStringResourceLoader;
/**
@@ -26,6 +27,16 @@
public class JetspeedPrincipalManagementApplication extends AbstractAdminWebApplication
{
+
+
+ protected void init()
+ {
+ super.init();
+
+ getResourceSettings().addStringResourceLoader(
+ new BundleStringResourceLoader("org.apache.jetspeed.portlets.security.resources.JetspeedPrincipalManagement"));
+ }
+
/**
* @see org.apache.wicket.Application#getHomePage()
*/
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$AssociationTypePanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet%24AssociationTypePanel.html?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$AssociationTypePanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$AssociationTypePanel.html Tue Apr 21 14:20:59 2009
@@ -23,14 +23,14 @@
<table>
<tr wicket:id="comments">
- <td wicket:id="Name"></td>
- <td><a href="" wicket:id="delete">Delete</a></td>
+ <td wicket:id="Name"></td>
+ <td><a href="" wicket:id="delete"><span wicket:id="deleteLabel"></span></a></td>
</tr>
</table>
<form wicket:id="assocationsForm">
<select wicket:id ="associationPrincipal">
</select>
- <input type="submit" wicket:id="addRelations" value="Add Associations" />
+ <input type="submit" wicket:id="addRelations"/>
</form>
</wicket:panel>
</html>
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewPrincipalPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet%24NewPrincipalPanel.html?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewPrincipalPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewPrincipalPanel.html Tue Apr 21 14:20:59 2009
@@ -19,14 +19,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" >
-<body>
<wicket:panel>
+
<form wicket:id="newUserForm">
-
<span>New User Name:</span>
<span><input type="text" wicket:id="userName" size="20" /></span>
<span><input type="submit" value="Add User" class="portlet-form-button" wicket:id="addUser"/></span>
</form>
</wicket:panel>
-</body>
</html>
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewUserPrincipalPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet%24NewUserPrincipalPanel.html?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewUserPrincipalPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$NewUserPrincipalPanel.html Tue Apr 21 14:20:59 2009
@@ -20,6 +20,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" >
<wicket:panel>
+
<form wicket:id="newUserForm">
<table cellpadding="0" cellspacing="1" border="1" width="100%">
<tr>
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalAttributesPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet%24PrincipalAttributesPanel.html?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalAttributesPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalAttributesPanel.html Tue Apr 21 14:20:59 2009
@@ -43,19 +43,19 @@
<form wicket:id="addAttrForm">
<table>
<tr>
- <td class="portlet-section-alternate">Name</td>
+ <td class="portlet-section-alternate"><span wicket:id="nameLabel"></span></td>
<td class="portlet-section-body">
<input type="text" wicket:id="userAttrName" size="20" class="portlet-form-field-label" />
</td>
</tr>
<tr>
- <td class="portlet-section-alternate">Value</td>
+ <td class="portlet-section-alternate"><span wicket:id="valueLabel"></span></td>
<td class="portlet-section-body">
<input type="text" wicket:id="userAttrValue" size="20" class="portlet-form-field-label" />
</td>
</tr>
</table>
- <input type="submit" value="Add" class="portlet-form-button" />
+ <input type="submit" wicket:id="addAttr" class="portlet-form-button" />
</form>
</wicket:panel>
</html>
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalCredentialsPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet%24PrincipalCredentialsPanel.html?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalCredentialsPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalCredentialsPanel.html Tue Apr 21 14:20:59 2009
@@ -24,44 +24,40 @@
<form wicket:id="userCredentialForm">
<table>
<tr>
- <td class="portlet-section-alternate">Value</td>
+ <td class="portlet-section-alternate"><span wicket:id="passwordLabel" /></td>
<td class="portlet-section-body" >
<input type="password" wicket:id="credentialValue" />
</td>
<td> </td>
<td class="portlet-section-body">
<input type="checkbox" wicket:id="credentialUpdateRequired" />
- Change required at next login
+ <span wicket:id="changerequiredLabel" />
</td>
</tr>
<tr>
- <td class="portlet-section-alternate">Last Logon</td>
+ <td class="portlet-section-alternate"><span wicket:id="lastLogonLabel" /></td>
<td class="portlet-section-body">
<span wicket:id="lastAuthenticationDate" />
</td>
<td> </td>
<td class="portlet-section-body">
<input type="checkbox" wicket:id="credentialEnabled" />
- Enabled
+ <span wicket:id="enabledLabel" />
</td>
</tr>
<tr>
- <td class="portlet-section-alternate">Expires</td>
+ <td class="portlet-section-alternate"><span wicket:id="expiresLabel" /></td>
<td class="portlet-section-body">
<span wicket:id="credentialExpirationDate" />
</td>
<td> </td>
<td class="portlet-section-body" nowrap="true">
<span valign="top" wicket:id="userExpiredFlag">
- <input type="radio" />Active
- <input type="radio" />Expired
- <input type="radio" />Extend
- <input type="radio" />Extend Unlimited
</span>
</td>
</tr>
</table>
- <input type="submit" value="Update" class="portlet-form-button" />
+ <input type="submit" wicket:id="submitForm" class="portlet-form-button" />
</form>
</wicket:panel>
</html>
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$UserPrincipalProfilePanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet%24UserPrincipalProfilePanel.html?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$UserPrincipalProfilePanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$UserPrincipalProfilePanel.html Tue Apr 21 14:20:59 2009
@@ -21,35 +21,34 @@
<html xmlns="http://www.w3.org/1999/xhtml" >
<wicket:panel>
<form wicket:id="profileForm">
- <input type="checkbox" wicket:id="userEnabled" />Enabled
- <input type="submit" wicket:id="submit" value="Update User" />
+ <input type="checkbox" wicket:id="userEnabled" /><span wicket:id="enabledLabel"></span>
+ <input type="submit" wicket:id="submit" />
</form>
<br/>
<form wicket:id="userRulesForm">
<table wicket:id="entries" cellpadding="0" cellspacing="1" border="0">
</table>
- <input type="submit" value="Remove" class="portlet-form-button" />
+ <input type="submit" wicket:id="submit" class="portlet-form-button" />
</form>
<br/>
<form wicket:id="addRuleForm">
<table>
<tr>
- <td class="portlet-section-alternate">Name</td>
+ <td class="portlet-section-alternate"><span wicket:id="userruleNamelabel"></span></td>
<td class="portlet-section-body" align="left">
<input type="text" wicket:id="locatorName" size="20" />
- Common Locator Names: [page,docset]
+ <span wicket:id="userruledesclabel"></span>
</td>
</tr>
<tr>
- <td class="portlet-section-alternate">Rule</td>
+ <td class="portlet-section-alternate"><span wicket:id="userrulelabel"></span></td>
<td class="portlet-section-body" align="left">
<select wicket:id="ruleName" class="portlet-form-field-label">
- <option>group-fallback</option>
</select>
</td>
</tr>
</table>
- <input type="submit" value="Add" class="portlet-form-button" />
+ <input type="submit" wicket:id="addRule" class="portlet-form-button" />
</form>
</wicket:panel>
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java Tue Apr 21 14:20:59 2009
@@ -30,7 +30,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.jetspeed.audit.AuditActivity;
-import org.apache.jetspeed.portlets.security.users.WicketUserAdmin;
+import org.apache.jetspeed.portlets.AdminPortletWebPage;
import org.apache.jetspeed.portlets.wicket.component.CheckBoxPropertyColumn;
import org.apache.jetspeed.portlets.wicket.component.PortletOddEvenItem;
import org.apache.jetspeed.profiler.rules.PrincipalRule;
@@ -48,6 +48,7 @@
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserCredential;
import org.apache.jetspeed.security.UserManager;
+import org.apache.wicket.Resource;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
@@ -79,11 +80,12 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.ResourceModel;
/**
* @author vkumar <a href="vkumar@apache.org">Vivek Kumar</a>
*/
-public class JetspeedPrincipalManagementPortlet extends WicketUserAdmin
+public class JetspeedPrincipalManagementPortlet extends AdminPortletWebPage
{
private Log log;
@@ -126,7 +128,7 @@
principalParam = getPreference(principalParamName);
if(principalParam == null)
{
- principalParam = getInitParam(principalParamName);
+ principalParam = getInitParam(principalParamName).toLowerCase();
}
principalType = getServiceLocator().getJetspeedPrincipalManagerProvider().getPrincipalType(principalParam);
ITab tab = null;
@@ -278,7 +280,8 @@
};
add(profileForm);
profileForm.add(new CheckBox("userEnabled", new PropertyModel(this, "userEnabled")));
- profileForm.add(new Button("submit"));
+ profileForm.add(new Label("enabledLabel",new ResourceModel("common.enabled")));
+ profileForm.add(new Button("submit",new ResourceModel(principalParam+".update.button")));
Form userRulesForm = new Form("userRulesForm")
{
protected void onSubmit()
@@ -301,7 +304,7 @@
getServiceLocator().getAuditActivity().logAdminAuthorizationActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(),
getSelectedPrincipal(), AuditActivity.USER_DELETE_PROFILE,
rule.getProfilingRule().getId() + "-" + rule.getLocatorName(),
- USER_ADMINISTRATION);
+ AdminPortletWebPage.USER_ADMINISTRATION);
}
}
}
@@ -332,8 +335,8 @@
return getUserRules().subList(first, first + count).iterator();
}
};
- IColumn[] columns = { new CheckBoxPropertyColumn(new Model(" "), "checked"), new PropertyColumn(new Model("security.name"), "rule.locatorName"),
- new PropertyColumn(new Model("security.value"), "rule.profilingRule") };
+ IColumn[] columns = { new CheckBoxPropertyColumn(new Model(" "), "checked"), new PropertyColumn(new ResourceModel("user.ruleName"), "rule.locatorName"),
+ new PropertyColumn(new ResourceModel("user.ruleValue"), "rule.profilingRule") };
DataTable userRulesDataTable = new DataTable("entries", columns, dataProvider, 10)
{
protected Item newRowItem(String id, int index, IModel model)
@@ -344,6 +347,7 @@
userRulesDataTable.addTopToolbar(new HeadersToolbar(userRulesDataTable, dataProvider));
userRulesDataTable.addBottomToolbar(new NavigationToolbar(userRulesDataTable));
userRulesForm.add(userRulesDataTable);
+ userRulesForm.add(new Button("submit",new ResourceModel("common.delete")));
add(userRulesForm);
Form addRuleForm = new Form("addRuleForm")
{
@@ -358,7 +362,7 @@
getServiceLocator().getProfiler().setRuleForPrincipal(getPrincipal(), getServiceLocator().getProfiler().getRule(ruleName), locatorName);
getServiceLocator().getAuditActivity().logAdminAuthorizationActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(),
getSelectedPrincipal(), AuditActivity.USER_ADD_PROFILE,
- ruleName + "-" + locatorName, USER_ADMINISTRATION);
+ ruleName + "-" + locatorName, AdminPortletWebPage.USER_ADMINISTRATION);
}
catch (Exception e)
{
@@ -368,10 +372,14 @@
}
}
};
+ addRuleForm.add(new Label("userruleNamelabel",new ResourceModel("user.ruleName")));
+ addRuleForm.add(new Label("userruledesclabel",new ResourceModel("user.rule.desc")));
TextField locatorNameField = new TextField("locatorName", new PropertyModel(this, "locatorName"));
addRuleForm.add(locatorNameField);
+ addRuleForm.add(new Label("userrulelabel",new ResourceModel("user.ruleValue")));
DropDownChoice ruleNameField = new DropDownChoice("ruleName", new PropertyModel(this, "ruleName"), getFullRules());
addRuleForm.add(ruleNameField);
+ addRuleForm.add(new Button("addRule",new ResourceModel("user.rule.add")));
add(addRuleForm);
}
@@ -716,7 +724,7 @@
// getUserManager().setPassword(getUserName(), null, getCredentialValue());
credential.setPassword(null, getCredentialValue());
getServiceLocator().getAuditActivity().logAdminCredentialActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(),
- getPrincipal().getName(), AuditActivity.PASSWORD_RESET, USER_ADMINISTRATION);
+ getPrincipal().getName(), AuditActivity.PASSWORD_RESET, AdminPortletWebPage.USER_ADMINISTRATION);
passwordSet = true;
}
if (getCredentialUpdateRequired() != credential.isUpdateRequired())
@@ -725,7 +733,7 @@
credential.setUpdateRequired(getCredentialUpdateRequired());
getServiceLocator().getAuditActivity()
.logAdminCredentialActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(),
- getPrincipal().getName(), AuditActivity.PASSWORD_UPDATE_REQUIRED, USER_ADMINISTRATION);
+ getPrincipal().getName(), AuditActivity.PASSWORD_UPDATE_REQUIRED, AdminPortletWebPage.USER_ADMINISTRATION);
}
if (getCredentialEnabled() != credential.isEnabled())
{
@@ -733,7 +741,7 @@
credential.setEnabled(getCredentialEnabled());
String activity = (getCredentialEnabled() ? AuditActivity.PASSWORD_ENABLED : AuditActivity.PASSWORD_DISABLED);
getServiceLocator().getAuditActivity().logAdminCredentialActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(),
- getPrincipal().getName(), activity, USER_ADMINISTRATION);
+ getPrincipal().getName(), activity, AdminPortletWebPage.USER_ADMINISTRATION);
}
String expiredFlagStr = getUserExpiredFlag();
if (expiredFlagStr != null)
@@ -744,7 +752,7 @@
// getUserManager().setPasswordExpiration(getUserName(), today);
credential.setExpirationDate(today);
getServiceLocator().getAuditActivity().logAdminCredentialActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(),
- getPrincipal().getName(), AuditActivity.PASSWORD_EXPIRE, USER_ADMINISTRATION);
+ getPrincipal().getName(), AuditActivity.PASSWORD_EXPIRE, AdminPortletWebPage.USER_ADMINISTRATION);
}
else if (expiredFlagStr.equals("extend"))
{
@@ -752,14 +760,14 @@
// TODO confirm with Ate/David
credential.setExpirationDate(MAX_DATE);
getServiceLocator().getAuditActivity().logAdminCredentialActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(),
- getPrincipal().getName(), AuditActivity.PASSWORD_EXTEND, USER_ADMINISTRATION);
+ getPrincipal().getName(), AuditActivity.PASSWORD_EXTEND, AdminPortletWebPage.USER_ADMINISTRATION);
}
else if (expiredFlagStr.equals("unlimited"))
{
// getUserManager().setPasswordExpiration(getUserName(), User.MAX_DATE);
credential.setExpirationDate(MAX_DATE);
getServiceLocator().getAuditActivity().logAdminCredentialActivity(getPortletRequest().getUserPrincipal().getName(), getIPAddress(),
- getPrincipal().getName(), AuditActivity.PASSWORD_UNLIMITED, USER_ADMINISTRATION);
+ getPrincipal().getName(), AuditActivity.PASSWORD_UNLIMITED, AdminPortletWebPage.USER_ADMINISTRATION);
}
}
manager.storePasswordCredential(credential);
@@ -787,21 +795,27 @@
}
};
PasswordTextField credentialValueField = new PasswordTextField("credentialValue", new PropertyModel(this, "credentialValue"));
+ form.add(new Label("passwordLabel",new ResourceModel("user.login.password")));
form.add(credentialValueField);
CheckBox credentialUpdateRequiredField = new CheckBox("credentialUpdateRequired", new PropertyModel(this, "credentialUpdateRequired"));
+ form.add(new Label("changerequiredLabel",new ResourceModel("user.change.required")));
form.add(credentialUpdateRequiredField);
Label lastAuthenticationDateLabel = new Label("lastAuthenticationDate", new PropertyModel(this, "lastAuthenticationDate"));
+ form.add(new Label("lastLogonLabel",new ResourceModel("user.login.last.logon")));
form.add(lastAuthenticationDateLabel);
CheckBox credentialEnabledField = new CheckBox("credentialEnabled", new PropertyModel(this, "credentialEnabled"));
+ form.add(new Label("enabledLabel",new ResourceModel("common.enabled")));
form.add(credentialEnabledField);
Label credentialExpirationDateLabel = new Label("credentialExpirationDate", new PropertyModel(this, "credentialExpirationDate"));
+ form.add(new Label("expiresLabel",new ResourceModel("user.login.expires")));
form.add(credentialExpirationDateLabel);
List expiredFlagChoices = new ArrayList();
- expiredFlagChoices.add("active");
- expiredFlagChoices.add("expired");
- expiredFlagChoices.add("extend");
- expiredFlagChoices.add("unlimited");
+ expiredFlagChoices.add(new ResourceModel("user.login.expires.active"));
+ expiredFlagChoices.add(new ResourceModel("user.login.expires.expired"));
+ expiredFlagChoices.add(new ResourceModel("user.login.expires.extend"));
+ expiredFlagChoices.add(new ResourceModel("user.login.expires.unlimited"));
RadioChoice userExpiredFlagField = new RadioChoice("userExpiredFlag", new PropertyModel(this, "userExpiredFlag"), expiredFlagChoices);
+ form.add(new Button("submitForm",new ResourceModel("common.update")));
form.add(userExpiredFlagField);
add(form);
}
@@ -918,7 +932,6 @@
@Override
public boolean isEnabled()
{
- // TODO Auto-generated method stub
return !attrib.isReadOnly();
}
});
@@ -927,7 +940,6 @@
@Override
public boolean isEnabled()
{
- // TODO Auto-generated method stub
return !attrib.isReadOnly();
}
});
@@ -956,7 +968,7 @@
};
userAttrsForm.add(usersList);
userAttrsForm.add(new PagingNavigator("navigator", usersList));
- Button updateAttrButton = new Button("updateAttr")
+ Button updateAttrButton = new Button("updateAttr",new ResourceModel("common.update"))
{
public void onSubmit()
{
@@ -971,7 +983,7 @@
attribs.put(userAttrName, userAttrValue);
getServiceLocator().getAuditActivity().logAdminAttributeActivity(getPrincipal().getName(), getIPAddress(), getPrincipal().getName(),
AuditActivity.USER_UPDATE_ATTRIBUTE, userAttrName, oldUserAttrValue, userAttrValue,
- USER_ADMINISTRATION);
+ AdminPortletWebPage.USER_ADMINISTRATION);
}
refreshData();
}
@@ -997,7 +1009,7 @@
getPrincipal().getSecurityAttributes().removeAttribute(userAttrName);
getServiceLocator().getAuditActivity().logAdminAttributeActivity(getPrincipal().getName(), getIPAddress(), getPrincipal().getName(),
AuditActivity.USER_DELETE_ATTRIBUTE, userAttrName, userAttrValue, "",
- USER_ADMINISTRATION);
+ AdminPortletWebPage.USER_ADMINISTRATION);
save = true;
}
catch (SecurityException e)
@@ -1043,7 +1055,7 @@
getManager().updatePrincipal(getPrincipal());
getServiceLocator().getAuditActivity()
.logAdminAttributeActivity(getPrincipal().getName(), getIPAddress(), getPrincipal().getName(),
- AuditActivity.USER_ADD_ATTRIBUTE, userAttrName, "", userAttrValue, USER_ADMINISTRATION);
+ AuditActivity.USER_ADD_ATTRIBUTE, userAttrName, "", userAttrValue, AdminPortletWebPage.USER_ADMINISTRATION);
}
catch (SecurityException e)
{
@@ -1056,10 +1068,13 @@
}
};
add(addAttrForm);
+ addAttrForm.add(new Label("nameLabel",new ResourceModel("common.name")));
TextField userAttrNameField = new TextField("userAttrName", new PropertyModel(this, "userAttrName"));
addAttrForm.add(userAttrNameField);
+ addAttrForm.add(new Label("valueLabel",new ResourceModel("common.value")));
TextField userAttrValueField = new TextField("userAttrValue", new PropertyModel(this, "userAttrValue"));
addAttrForm.add(userAttrValueField);
+ addAttrForm.add(new Button("addAttr",new ResourceModel("common.attribute.add")));
}
public List getUserAttributes()
@@ -1205,7 +1220,7 @@
{
final JetspeedPrincipal principal = (JetspeedPrincipal) listItem.getModelObject();
listItem.add(new Label("Name", principal.getName()));
- listItem.add(new Link("delete")
+ Link deleteLink = new Link("delete")
{
@Override
public void onClick()
@@ -1227,7 +1242,9 @@
// TODO: handle exception
}
}
- });
+ };
+ deleteLink.add(new Label("deleteLabel",new ResourceModel("common.delete")));
+ listItem.add(deleteLink);
}
};
add(commentListView);
@@ -1236,7 +1253,7 @@
DropDownChoice dropDown = new DropDownChoice("associationPrincipal", new PropertyModel(this, "associationPrincipal"), getNames(),
new ChoiceRenderer("name", "name"));
assocationsForm.add(dropDown);
- Button addRelations = new Button("addRelations")
+ Button addRelations = new Button("addRelations",new ResourceModel("common.association.add"))
{
@Override
public void onSubmit()
Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/JetspeedPrincipalManagement.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/JetspeedPrincipalManagement.properties?rev=767156&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/JetspeedPrincipalManagement.properties (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/JetspeedPrincipalManagement.properties Tue Apr 21 14:20:59 2009
@@ -0,0 +1,47 @@
+user.name=User
+role.name=Role
+group.name=Group
+
+common.delete=Delete
+common.update=Update
+common.edit=Edit
+common.name=Name
+common.value=Value
+common.enabled=Enabled
+
+common.association.add=Add association
+common.attribute.name=Attribute Name
+common.attribute.value=Attribute Value
+common.attribute.add=Add Attribute
+
+
+user.add.button=Add User
+user.remove.button=Remove User
+user.update.button=Update User
+
+user.title=User Name:
+user.password=Password:
+user.changepassword=Change password on first Login:
+user.profileRule=Profiling Rule:
+
+user.ruleName=Profile Name
+user.ruleValue=Rule
+user.rule.desc=Common Locator Names: [page,docset]
+user.rule.add=Add Rule
+
+user.login.expires=Expires
+user.login.last.logon=Last logon
+user.change.required=Change required at next login
+user.login.expires.active=Active
+user.login.expires.expired=Expired
+user.login.expires.extend=Extend
+user.login.expires.unlimited=Unlimited
+
+
+role.add.button=Add Roler
+role.remove.button=Remove Role
+role.update.button=Update Role
+
+group.add.button=Add User
+group.remove.button=Remove User
+group.update.button=Update User
\ No newline at end of file
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/JetspeedPrincipalManagement.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/JetspeedPrincipalManagement_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/JetspeedPrincipalManagement_en.properties?rev=767156&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/JetspeedPrincipalManagement_en.properties (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/JetspeedPrincipalManagement_en.properties Tue Apr 21 14:20:59 2009
@@ -0,0 +1,47 @@
+user.name=User
+role.name=Role
+group.name=Group
+
+common.delete=Delete
+common.update=Update
+common.edit=Edit
+common.name=Name
+common.value=Value
+common.enabled=Enabled
+
+common.association.add=Add association
+common.attribute.name=Attribute Name
+common.attribute.value=Attribute Value
+common.attribute.add=Add Attribute
+
+
+user.add.button=Add User
+user.remove.button=Remove User
+user.update.button=Update User
+
+user.title=User Name:
+user.password=Password:
+user.changepassword=Change password on first Login:
+user.profileRule=Profiling Rule:
+
+user.ruleName=Profile Name
+user.ruleValue=Rule
+user.rule.desc=Common Locator Names: [page,docset]
+user.rule.add=Add Rule
+
+user.login.password=New password
+user.login.expires=Expires
+user.login.last.logon=Last logon
+user.change.required=Change required at next login
+user.login.expires.active=Active
+user.login.expires.expired=Expired
+user.login.expires.extend=Extend
+user.login.expires.unlimited=Unlimited
+
+role.add.button=Add Roler
+role.remove.button=Remove Role
+role.update.button=Update Role
+
+group.add.button=Add User
+group.remove.button=Remove User
+group.update.button=Update User
\ No newline at end of file
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/resources/JetspeedPrincipalManagement_en.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/JetspeedDocument.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/JetspeedDocument.java?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/JetspeedDocument.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/JetspeedDocument.java Tue Apr 21 14:20:59 2009
@@ -17,6 +17,8 @@
package org.apache.jetspeed.portlets.site;
import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -109,7 +111,7 @@
*/
public void setName(String name)
{
- this.name = name;
+ this.name = getEscapedName(name);
}
/**
@@ -343,4 +345,21 @@
}
}
}
+
+ protected String getEscapedName(String pageName)
+ {
+ if(pageName== null)
+ {
+ return pageName;
+ }
+ try
+ {
+ return URLEncoder.encode(pageName, "UTF-8").replace('%', '_');
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ e.printStackTrace();
+ return pageName;
+ }
+ }
}
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MetaDataPanel.html?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html Tue Apr 21 14:20:59 2009
@@ -26,20 +26,20 @@
<table style="width:100%;">
<tr>
- <td><label wicket:id="name-label">[name label]</label>: <input
- type="text" wicket:id="name" /></td>
+ <td width="80px"> <label wicket:id="name-label" for="name" class="portlet-form-field-label">[name label]</label>: <input
+ type="text" wicket:id="name" id="name" class="portlet-form-field"/></td>
</tr>
<tr>
- <td><label wicket:id="language-label">[language label]</label>:
- <input type="text" wicket:id="language" /></td>
+ <td><label wicket:id="language-label" for="language" class="portlet-form-field-label">[language label]</label>:
+ <input type="text" wicket:id="language" id="language" class="portlet-form-field"/></td>
</tr>
<tr>
- <td><label wicket:id="value-label">[value label]</label>: <input
- type="text" wicket:id="metaValue" /></td>
+ <td><label wicket:id="value-label" for="metaValue" class="portlet-form-field-label">[value label]</label>: <input
+ type="text" wicket:id="metaValue" id="metaValue" class="portlet-form-field"/></td>
</tr>
<tr>
<td>
- <input type="button" wicket:id="save" value="Save" />
+ <input type="button" wicket:id="save" value="Save" class="portlet-form-button"/>
</td>
</tr>
</table>
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MetaDataTab.html?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html Tue Apr 21 14:20:59 2009
@@ -26,8 +26,8 @@
<table cellpadding="2">
<thead>
<tr>
- <th class="portlet-section-header">Security Constraint</th>
- <th class="portlet-section-header">Constraint Type</th>
+ <th class="portlet-section-header"><span wicket:id="nameLabel" /></th>
+ <th class="portlet-section-header"><span wicket:id="languageLabel" /></th>
<th> </th>
<th> </th>
</tr>
@@ -36,8 +36,8 @@
<td><span wicket:id="name" /></td>
<td><span wicket:id="language" /></td>
<td><span wicket:id="value" /></td>
- <td><a href wicket:id="edit" >Edit</a></td>
- <td> <a href wicket:id="delete">Delete</a></td>
+ <td><a href wicket:id="edit" ><span wicket:id="editLabel" /></a></td>
+ <td> <a href wicket:id="delete"><span wicket:id="deleteLabel" /></a></td>
</tr>
</table>
</span>
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java Tue Apr 21 14:20:59 2009
@@ -19,7 +19,6 @@
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -67,7 +66,7 @@
import org.apache.jetspeed.page.document.NodeException;
import org.apache.jetspeed.page.document.UnsupportedDocumentTypeException;
import org.apache.jetspeed.portalsite.MenuElement;
-import org.apache.jetspeed.portlets.security.users.WicketUserAdmin;
+import org.apache.jetspeed.portlets.AdminPortletWebPage;
import org.apache.jetspeed.portlets.site.SiteTreeNode.FileType;
import org.apache.jetspeed.portlets.wicket.component.DynamicResourceLink;
import org.apache.jetspeed.portlets.wicket.component.JavascriptEventConfirmation;
@@ -111,6 +110,7 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.validation.validator.StringValidator;
@@ -119,9 +119,9 @@
*
* @author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
+ * @version $Id$
*/
-public class PortalSiteManager extends WicketUserAdmin
+public class PortalSiteManager extends AdminPortletWebPage
{
// protected final Log log = LogFactory.getLog(this.getClass());
// components
@@ -556,6 +556,10 @@
final ModalWindow metaDataModalWindow;
final WebMarkupContainer ajaxPanel = new WebMarkupContainer("basePanel");
add(metaDataModalWindow = new ModalWindow("modalwindow"));
+
+ ajaxPanel.add(new Label("nameLabel", new ResourceModel("metedataTab.name")));
+ ajaxPanel.add(new Label("languageLabel", new ResourceModel("metedataTab.language")));
+
final ListView metaDataListView = new ListView("metaData", new PropertyModel(this, "document.metaData"))
{
private static final long serialVersionUID = 1L;
@@ -566,7 +570,7 @@
listItem.add(new Label("name", metaData.getName()));
listItem.add(new Label("language", metaData.getLanguage()));
listItem.add(new Label("value", metaData.getValue()));
- listItem.add(new AjaxLink("edit", new Model("Edit"))
+ AjaxLink editLink = new AjaxLink("edit", new Model("edit"))
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -574,8 +578,11 @@
metaDataModalWindow.setContent(new MetaDataPanel(metaDataModalWindow.getContentId(), metaData, ajaxPanel));
metaDataModalWindow.show(target);
}
- });
- listItem.add(new AjaxLink("delete", new Model("Delete"))
+ };
+ editLink.add(new Label("editLabel",new ResourceModel("common.edit")));
+ listItem.add(editLink);
+
+ AjaxLink deleteLink = new AjaxLink("delete",new Model("delete"))
{
private static final long serialVersionUID = 1L;
@@ -585,13 +592,17 @@
metaDataAction(REMOVE_ACTION, metaData, null);
target.addComponent(ajaxPanel);
}
- }.add(new JavascriptEventConfirmation("onclick", "are you sure?")));
+ };
+
+ deleteLink.add(new Label("deleteLabel", new ResourceModel("common.delete")));
+ deleteLink.add(new JavascriptEventConfirmation("onclick", "are you sure?"));
+ listItem.add(deleteLink);
}
};
metaDataListView.setOutputMarkupId(true);
ajaxPanel.setOutputMarkupId(true);
ajaxPanel.add(metaDataListView);
- add(new AjaxLink("new", new Model("New"))
+ add(new AjaxLink("new", new ResourceModel("common.new"))
{
@Override
public void onClick(AjaxRequestTarget target)
@@ -982,6 +993,12 @@
@Override
public void onClick()
{
+ if(node.getDocType().equals(SiteTreeNode.FileType.Folder))
+ {
+ exportObject.setFileName(getDocument().getName()+".zip");
+ }else{
+ exportObject.setFileName(getDocument().getName());
+ }
exportObject.setNode(getUserSelectedNode());
exportObject.setUserName(getPortletRequest().getUserPrincipal().getName());
exportObject.setRecursively(isRecursively());
@@ -1100,16 +1117,16 @@
fc = new RequiredTextField("name", new PropertyModel(this, "metaData.name"));
fc.add(StringValidator.minimumLength(2));
metaDataForm.add(fc);
- metaDataForm.add(new Label("name-label", "Name"));
+ metaDataForm.add(new Label("name-label", new ResourceModel("metedataTab.name")));
fc = new RequiredTextField("language", new PropertyModel(this, "metaData.language"));
fc.add(StringValidator.minimumLength(2));
metaDataForm.add(fc);
- metaDataForm.add(new Label("language-label", "Language"));
+ metaDataForm.add(new Label("language-label", new ResourceModel("metedataTab.language")));
fc = new RequiredTextField("metaValue", new PropertyModel(this, "metaData.value"));
fc.add(StringValidator.minimumLength(2));
metaDataForm.add(fc);
- metaDataForm.add(new Label("value-label", "Value"));
- metaDataForm.add(new AjaxButton("save", metaDataForm)
+ metaDataForm.add(new Label("value-label", new ResourceModel("metedataTab.value")));
+ metaDataForm.add(new AjaxButton("save",new ResourceModel("common.save"), metaDataForm)
{
@Override
protected void onSubmit(AjaxRequestTarget target, Form form)
@@ -1646,7 +1663,16 @@
private boolean recursively;
private String userName;
private ExportObject exportObject;
- private FileInputStream inputStream;
+ private String fileName;
+ private String filePath;
+
+ /**
+ * @param fileName the fileName to set
+ */
+ public void setFileName(String fileName)
+ {
+ this.fileName = fileName;
+ }
/**
* @param recursively
@@ -1685,15 +1711,7 @@
public void close()
{
- try
- {
- inputStream.close();
- }
- catch (IOException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ //
}
public String getContentType()
@@ -1708,32 +1726,29 @@
public long getLength()
{
- // TODO Auto-generated method stub
return 0;
}
public String getName()
{
- return "";
+ return this.fileName;
}
public InputStream getResource()
{
- return inputStream;
+ InputStream fileStream = null;
+ try{
+ fileStream = new FileInputStream(exportObject.getFilePath());
+ }catch (Exception e) {
+ // TODO: handle exception
+ }
+ return fileStream;
}
public void open()
{
exportObject = exportJetspeedtObject(node, recursively, userName);
- try
- {
- inputStream = new FileInputStream(exportObject.getFilePath());
- }
- catch (FileNotFoundException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ filePath = exportObject.getFilePath();
}
}
@@ -1831,7 +1846,14 @@
{
SiteTreeNode treeNode = getUserSelectedNode();
DefaultMutableTreeNode node = getSelectedNode();
- Folder folder = getServiceLocator().getPageManager().newFolder(treeNode.getNodePath() + "/" + document.getName());
+ String documentPath="";
+ if(treeNode.getNodePath().equals(JETSPEED_PATH_SEPRATOR))
+ {
+ documentPath = JETSPEED_PATH_SEPRATOR;
+ }else{
+ documentPath = treeNode.getNodePath() + JETSPEED_PATH_SEPRATOR;
+ }
+ Folder folder = getServiceLocator().getPageManager().newFolder(documentPath + document.getName());
folder.setTitle(document.getTitle());
folder.setShortTitle(document.getShortTitle());
folderAction(folder,SAVE_ACTION);
@@ -1910,7 +1932,14 @@
{
SiteTreeNode treeNode = getUserSelectedNode();
DefaultMutableTreeNode node = getSelectedNode();
- Page page = getServiceLocator().getPageManager().newPage(treeNode.getNodePath() + "/" + document.getName() + ".psml");
+ String documentPath="";
+ if(treeNode.getNodePath().equals(JETSPEED_PATH_SEPRATOR))
+ {
+ documentPath = JETSPEED_PATH_SEPRATOR;
+ }else{
+ documentPath = treeNode.getNodePath() + JETSPEED_PATH_SEPRATOR;
+ }
+ Page page = getServiceLocator().getPageManager().newPage(documentPath + document.getName() + ".psml");
page.setTitle(document.getTitle());
page.setShortTitle(document.getShortTitle());
page.setDefaultDecorator(document.getPageDecorator(), Fragment.LAYOUT);
@@ -1988,7 +2017,14 @@
{
SiteTreeNode treeNode = getUserSelectedNode();
DefaultMutableTreeNode node = getSelectedNode();
- Link link = getServiceLocator().getPageManager().newLink(treeNode.getNodePath() + "/" + document.getName() + ".link");
+ String documentPath="";
+ if(treeNode.getNodePath().equals(JETSPEED_PATH_SEPRATOR))
+ {
+ documentPath = JETSPEED_PATH_SEPRATOR;
+ }else{
+ documentPath = treeNode.getNodePath() + JETSPEED_PATH_SEPRATOR;
+ }
+ Link link = getServiceLocator().getPageManager().newLink(documentPath + document.getName() + ".link");
link.setTitle(document.getTitle());
link.setShortTitle(document.getShortTitle());
link.setUrl(document.getUrl());
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerApplication.java?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerApplication.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerApplication.java Tue Apr 21 14:20:59 2009
@@ -17,6 +17,8 @@
package org.apache.jetspeed.portlets.site;
import org.apache.jetspeed.portlets.wicket.AbstractAdminWebApplication;
+import org.apache.wicket.markup.html.AjaxServerAndClientTimeFilter;
+import org.apache.wicket.resource.loader.BundleStringResourceLoader;
/**
* @author <a href="mailto:vkumar@apache.org">Vivek Kumar</a>
@@ -26,6 +28,15 @@
{
@Override
+ protected void init()
+ {
+
+ getResourceSettings().addStringResourceLoader(
+ new BundleStringResourceLoader("org.apache.jetspeed.portlets.site.resources.PortalSiteManager"));
+ getRequestCycleSettings().addResponseFilter(new AjaxServerAndClientTimeFilter());
+ }
+
+ @Override
public Class getHomePage()
{
return PortalSiteManager.class;
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager.properties?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager.properties Tue Apr 21 14:20:59 2009
@@ -48,3 +48,14 @@
menus = Menus
security = Security
+# Common used resource Strings
+common.name=Name
+common.edit=Edit
+common.delete=Delete
+common.new=New
+common.save=Save
+
+# Resource Strings for MetaData Tab
+metedataTab.name=Name
+metedataTab.language=Language
+metedataTab.value=Value
\ No newline at end of file
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager_en.properties?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager_en.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/PortalSiteManager_en.properties Tue Apr 21 14:20:59 2009
@@ -50,3 +50,14 @@
menus = Menus
security = Security
+# Common used resource Strings
+common.name=Name
+common.edit=Edit
+common.delete=Delete
+common.new=New
+common.save=Save
+
+# Resource Strings for MetaData Tab
+metedataTab.name=Name
+metedataTab.language=Language
+metedataTab.value=Value
\ No newline at end of file
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java?rev=767156&r1=767155&r2=767156&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/wicket/AdminWicketPortlet.java Tue Apr 21 14:20:59 2009
@@ -60,7 +60,8 @@
paName = ((JetspeedPortletContext) config.getPortletContext()).getApplicationDefinition().getName();
}
- protected void processRequest(PortletRequest request, PortletResponse response, String requestType, String pageType) throws PortletException, IOException
+ @Override
+ protected void processRequest(PortletRequest request, PortletResponse response,String pageType) throws PortletException, IOException
{
request.setAttribute(JETSPEED_PA_IDENTIFIER, this.paName);
request.setAttribute(INIT_PARAMS, this.initParams);
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org