JBoss Portal SVN: r12411 - branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-12-19 14:39:50 -0500 (Fri, 19 Dec 2008)
New Revision: 12411
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties
Log:
syntax correction
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-12-19 17:41:12 UTC (rev 12410)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-12-19 19:39:50 UTC (rev 12411)
@@ -87,7 +87,7 @@
IDENTITY_SECURITY_QUESTION=Security Question
IDENTITY_SECURITY_ANSWER=Security Answer
IDENTITY_LAST_LOGIN=Last login
-IDENTITY_REIGSTRATION_DATE=Registration Date
+IDENTITY_REGISTRATION_DATE=Registration Date
IDENTITY_ENABLED=Enabled
IDENTITY_CATEGORY_GENERAL=General Preferences
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2008-12-19 17:41:12 UTC (rev 12410)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2008-12-19 19:39:50 UTC (rev 12411)
@@ -233,7 +233,7 @@
IDENTITY_REGISTER_VERIFY_CAPTCHA = V\u00E9rification visuelle
-IDENTITY_REIGSTRATION_DATE = Enregistr\u00E9 le
+IDENTITY_REGISTRATION_DATE = Enregistr\u00E9 le
IDENTITY_SECURITY_ANSWER = R\u00E9ponse \u00E0 votre question de s\u00E9curit\u00E9
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2008-12-19 17:41:12 UTC (rev 12410)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2008-12-19 19:39:50 UTC (rev 12411)
@@ -39,6 +39,7 @@
IDENTITY_REGISTER_SUCCESS_TITLE=Il tuo account \u00e8 stato creato con successo. Puoi ora loggarti.
IDENTITY_REGISTER_PENDING_TITLE=Un' e-mail \u00e8 stata mandata al tuo indirizzo e-mail per confermare la registrazione.
IDENTITY_REGISTER_REQUIRED_INFORMATION=indica un campo richiesto.
+IDENTITY_REGISTER_FAILED=La registrazione \u00e8 fallita per un motivo sconosciuto.
IDENTITY_LOST_PASSWORD_TITLE=Dimenticati i dati del tuo login?
IDENTITY_LOST_PASSWORD_DESCRIPTION=Inserisci il tuo nome utente per azzerare la password.
@@ -47,6 +48,8 @@
IDENTITY_LOST_PASSWORD_STATUS_404=Nessun account trovato.
IDENTITY_LOST_PASSWORD_STATUS_TITLE=Password smarrita
+IDENTITY_SERVER_ERROR=Errore inaspettato sul Server dell\'identit\u00e0
+
IDENTITY_EDIT_PROFILE_ERROR=Errore nell'aggiornamento del profilo.
IDENTITY_EDIT_PASSWORD_TITLE=Cambia la password
IDENTITY_EDIT_PASSWORD_CURRENT=Password corrente
@@ -87,7 +90,7 @@
IDENTITY_SECURITY_QUESTION=Domanda di sicurezza
IDENTITY_SECURITY_ANSWER=Risposta di sicurezza
IDENTITY_LAST_LOGIN=Ultimo login
-IDENTITY_REIGSTRATION_DATE=Data di registrazione
+IDENTITY_REGISTRATION_DATE=Data di registrazione
IDENTITY_ENABLED=Attivo
IDENTITY_CATEGORY_GENERAL=Preferenze generali
@@ -116,9 +119,7 @@
IDENTITY_MANAGEMENT_EDIT_ROLE=Modifica il ruolo
IDENTITY_MANAGEMENT_CREATE_ROLE=Crea il ruolo
IDENTITY_MANAGEMENT_DISABLE=Disabilita
-IDENTITY_MANAGEMENT_DISABLE_USER_DISABLED=Utente disabilitato
IDENTITY_MANAGEMENT_ENABLE=Abilita
-IDENTITY_MANAGEMENT_ENABLE_USER_ENABLED=Utente abilitato
IDENTITY_MANAGEMENT_RESET_PASSWORD=Azzera la password
IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Azzera la password all'utente
IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=L'utente ricever\u00e0 una password casuale al suo indirizzo e-mail.
@@ -169,8 +170,6 @@
IDENTITY_VALIDATION_ERROR_REGISTRATION=Fallita la registrazione dell'utente.
IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Il nome utente esiste gi\u00e0. Errore durante la validazione della password.
IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Errore durante la validazione del nome utente.
-IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=Il nome del ruolo \u00e8 gi\u00e0 stato preso.
-IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=Errore nella validazione del nome del ruolo.
IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=Le passwords non coincidono.
IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Errore durante la validazione della password.
IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Indirizzo e-mail non valido.
@@ -179,9 +178,4 @@
# Example usage for dynamic values
IDENTITY_DYNAMIC_VALUE_TEST=titolo di test
-IDENTITY_DYNAMIC_VALUE_TEST2=titolo di test2
-
-javax.portlet.title=Profilo utente
-javax.portlet.keywords=amministrazione,utente
-
-javax.faces.component.UIInput.REQUIRED=Il valore \u00e8 richiesto
\ No newline at end of file
+IDENTITY_DYNAMIC_VALUE_TEST2=titolo di test2
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties 2008-12-19 17:41:12 UTC (rev 12410)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties 2008-12-19 19:39:50 UTC (rev 12411)
@@ -87,7 +87,7 @@
IDENTITY_SECURITY_QUESTION=\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439 \u0432\u043e\u043f\u0440\u043e\u0441
IDENTITY_SECURITY_ANSWER=\u041e\u0442\u0432\u0435\u0442 \u043d\u0430 \u0441\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439 \u0432\u043e\u043f\u0440\u043e\u0441
IDENTITY_LAST_LOGIN=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0432\u0445\u043e\u0434 \u0441 \u0441\u0438\u0441\u0442\u0435\u043c\u0443
-IDENTITY_REIGSTRATION_DATE=\u0414\u0430\u0442\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
+IDENTITY_REGISTRATION_DATE=\u0414\u0430\u0442\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
IDENTITY_ENABLED=\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u043e
IDENTITY_CATEGORY_GENERAL=\u041e\u0441\u043d\u043e\u0432\u043d\u044b\u0435 \u043f\u0440\u0435\u0434\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438
17 years, 7 months
JBoss Portal SVN: r12410 - branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-12-19 12:41:12 -0500 (Fri, 19 Dec 2008)
New Revision: 12410
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java
Log:
JBPORTAL-2117 - org.jboss.portal.core.cms.CMSObjectCommandFactoryService incorrectly uses "path" as a render parameter
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java 2008-12-19 12:30:28 UTC (rev 12409)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java 2008-12-19 17:41:12 UTC (rev 12410)
@@ -168,7 +168,7 @@
if (e.toString().indexOf("Access to this resource is denied") != -1)
{
ParametersStateString parameters = ParametersStateString.create();
- parameters.setValue("path", requestPath);
+ parameters.setValue(CMSPortlet.RENDER_PARAMETER_PATH, requestPath);
return new InvokePortletWindowRenderCommand(targetWindowId, Mode.VIEW, null, parameters);
}
else
17 years, 7 months
JBoss Portal SVN: r12409 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-12-19 07:30:28 -0500 (Fri, 19 Dec 2008)
New Revision: 12409
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
Log:
portlet instance test fix
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-12-18 22:45:35 UTC (rev 12408)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-12-19 12:30:28 UTC (rev 12409)
@@ -40,6 +40,9 @@
private static final String LINK_TAB_PI = "//a[contains(@id,'admin-subtab-form:portlet-instance-link')]";
private static final String LINK_PI_MAIN = "//a[contains(@id,'instance-form1:instance-link')]";
private static final String TABLE_DISPNAMES = "//table[contains(@id,'instance-display-form:locale-datatable')]";
+ private static final String LNK_SEC_BUTTON = "//table[contains(@id,''instancesTable2'')]/tbody/tr[{0}]/td/table/tbody/tr/td/a[contains(@class,''Security'')]";
+ //private static final String LNK_PREF_WELCOMEPORT = "//a[contains(@id,'security-JSPPortletInstance')]";
+
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
@@ -52,14 +55,6 @@
public void logoutAfterTest() {
}
-
- @Test(enabled=true)
- public void testGo()
- {
- selenium.setSpeed("2000");
- goToPI();
- Assert.assertTrue(selenium.isTextPresent("CoordinationPublicParametersPortletInstance1"));
- }
@Test(enabled = true)
public void testAddName() {
@@ -126,9 +121,15 @@
@Test(enabled = true)
public void testSecure() {
+ String instance_name = "JSPPortletInstance";
+ String table = "instancesTable2";
+
selenium.click(LINK_20_PAGE);
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click(LINK_PREF_WELCOMEPORT);
+
+ int r = findTableRow(table, instance_name, 0);
+
+ selenium.click(MessageFormat.format(LNK_SEC_BUTTON, r));
selenium.waitForPageToLoad("30000");
selenium.click("//input[contains(@name,'common-edit-security-form:cars_2')]");
selenium.click("//input[contains(@name,'common-edit-security-form:cars_1')]");
@@ -147,8 +148,10 @@
goToPI();
selenium.click(LINK_20_PAGE);
+
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click(LINK_PREF_WELCOMEPORT);
+ r = findTableRow(table, instance_name, 0);
+ selenium.click(MessageFormat.format(LNK_SEC_BUTTON, r));
selenium.waitForPageToLoad("30000");
selenium.click("//input[contains(@name,'common-edit-security-form:cars_0')]");
selenium.click("//input[contains(@name,'common-edit-security-form:cars_1') and @value='admin']");
@@ -163,15 +166,17 @@
// then really stop the greetings portlet
goToPI();
+ selenium.setSpeed("5000");
selenium.click(LINK_20_PAGE);
- selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click(LINK_PREF_WELCOMEPORT);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ r = findTableRow(table, instance_name, 0);
+ selenium.click(MessageFormat.format(LNK_SEC_BUTTON, r));
selenium.waitForPageToLoad("30000");
- selenium.click("//input[contains(@name='common-edit-security-form:cars_0')]");
- selenium.click("//input[contains(@name='common-edit-security-form:cars_1') and @value='admin']");
- selenium.click("//input[contains(@name='common-edit-security-form:cars_0') and @value='admin']");
- selenium.click("//input[contains(@name='common-edit-security-form:cars_2') and @value='admin']");
- selenium.click("//input[contains(@name='common-edit-security-form:cars_1')]");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_0')]");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_1') and @value='admin']");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_0') and @value='admin']");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_2') and @value='admin']");
+ selenium.click("//input[contains(@name,'common-edit-security-form:cars_1')]");
selenium.click(SUBMIT_SECURITY_UPDATE);
selenium.waitForPageToLoad("30000");
17 years, 7 months