JBoss Portal SVN: r13166 - modules/portlet/tags/JBP_PORTLET_2_0_4/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-07 04:54:50 -0400 (Tue, 07 Apr 2009)
New Revision: 13166
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_4/build/pom.xml
Log:
oups
Modified: modules/portlet/tags/JBP_PORTLET_2_0_4/build/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_4/build/pom.xml 2009-04-06 14:33:48 UTC (rev 13165)
+++ modules/portlet/tags/JBP_PORTLET_2_0_4/build/pom.xml 2009-04-07 08:54:50 UTC (rev 13166)
@@ -115,7 +115,7 @@
<plugin>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-maven2</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.1</version>
</plugin>
</plugins>
</pluginManagement>
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r13165 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium: cms and 1 other directory.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-04-06 10:33:48 -0400 (Mon, 06 Apr 2009)
New Revision: 13165
Removed:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSUserInterfaceTestCase.java
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java
Log:
[selenium] - more javadoc
Deleted: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java 2009-04-06 13:03:58 UTC (rev 13164)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java 2009-04-06 14:33:48 UTC (rev 13165)
@@ -1,172 +0,0 @@
-package org.jboss.portal.test.selenium;
-
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-import com.thoughtworks.selenium.DefaultSelenium;
-import com.thoughtworks.selenium.SeleniumException;
-
-public class JBossSelenium extends DefaultSelenium {
-
- protected static String PAGE_LOAD= "500000";
- protected static int count;
-
- @Override
- public void click(String locator) {
- try {
- try {
- super.click(locator);
- }
- catch (SeleniumException e){
-
- String name = "E_";
- Pattern methodname = Pattern.compile("^org.jboss.portal.test.selenium\\S+test\\S+\\(\\S+\\)");
- for(int i=0;i<e.getStackTrace().length;i++){
- String input = e.getStackTrace()[i].toString();
- Matcher match = methodname.matcher(input);
- if (match.matches()){
- input = input.replace("org.jboss.portal.test.selenium","");
- input = input.replaceAll("\\(.*\\)","");
- name += input;
- }
- }
- name += "."+count;
- try {
- PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(name+".html")));
- out.println(getHtmlSource());
- out.close();
- } catch (IOException e1) {
- e1.printStackTrace();
- }
- try {
- windowMaximize();
- captureScreenshot(name + ".jpg");
- } catch (SeleniumException e2) {
- e2.printStackTrace();
- }
- count++;
-
- throw new SeleniumException(e);
- }
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- @Override
- public void open(String locator) {
- try {
- super.open(locator);
- }
- catch (SeleniumException e){
- try {
- PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter("html"+count+".html")));
- out.println(getHtmlSource());
- out.close();
- } catch (IOException e1) {
- e1.printStackTrace();
- }
- windowMaximize();
- captureScreenshot("shot"+ count +".jpg");
- count++;
- throw new SeleniumException(e);
- }
- }
-
- @Override
- public boolean isElementPresent(String locator){
- try {
- return super.isElementPresent(locator);
- }
- catch (SeleniumException e){
- try {
- PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter("html"+count+".html")));
- out.println(getHtmlSource());
- out.close();
- } catch (IOException e1) {
- e1.printStackTrace();
- }
- windowMaximize();
- captureScreenshot("shot"+ count +".jpg");
- count++;
- throw new SeleniumException(e);
- }
- }
-
-
-
- public JBossSelenium(String serverHost, int serverPort, String browserStartCommand, String browserURL, String timeout) {
- super(serverHost, serverPort, browserStartCommand, browserURL);
- PAGE_LOAD = timeout;
- }
-
- public JBossSelenium(String serverHost, int serverPort, String browserStartCommand, String browserURL) {
- super(serverHost, serverPort, browserStartCommand, browserURL);
- }
-
- protected void clickAndWait(String locator) {
- click(locator);
- waitForPageToLoad(PAGE_LOAD);
- }
-
- protected void clickAndWait(String locator, String timeout) {
- click(locator);
- waitForPageToLoad(timeout);
- }
-
- protected void clickAndWaitIfVisible(String id) {
-
- if (isElementPresent(id)) {
- click(id);
-
- waitForPageToLoad(PAGE_LOAD);
- }
- }
-
- public void clickIfVisible(String id) {
-
- if (isElementPresent(id)){
- click(id);
-
- waitForPageToLoad(PAGE_LOAD);
- }
- }
- protected boolean findLink(String id) {
- for (String link : getAllLinks()) {
- if (link.equals(id)) {
- return true;
- }
- }
- for (String link : getAllFields()) {
- if (link.equals(id)) {
- return true;
- }
- }
-
- return false;
- }
-
- protected int findTableRow(String tableLocation, String searchName, int searchCol) {
- return Integer.valueOf(getEval("selenium.findTableRow(\"" + tableLocation + "\",'" + searchName + "'," + searchCol + ")"));
- }
-
- protected int countTableRows(String tableLocation) {
- return Integer.valueOf(getEval("selenium.countTableRows(\"" + tableLocation + "\")"));
- }
-
- protected void waitFor(long time){
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
-}
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2009-04-06 13:03:58 UTC (rev 13164)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2009-04-06 14:33:48 UTC (rev 13165)
@@ -24,13 +24,13 @@
public final String TBL_FILE_PENDING = getProp(casePfx + "tbl.file.pending", "//div[@id='center']/div/div/table[2]");
@BeforeMethod(groups = { "log" })
- public void loginBeforeTest() {
+ protected void loginBeforeTest() {
logoutIfPossible();
login("admin", "admin");
}
@AfterMethod(groups = { "log" })
- public void logoutAfterTest() {
+ protected void logoutAfterTest() {
}
@@ -169,7 +169,8 @@
}
/**
- * Editing of a file.
+ * Editing of a file. File name "file2edit" is created and then edited. Nothing is changed, but the file is saved again. It is asserted, that the version
+ * got incremented.
*/
@Test(enabled = true, description = "Editing of a file.")
public void testEditFile() {
@@ -210,7 +211,8 @@
}
/**
- * Creation of an existing file.
+ * Creation of an existing file. The file named "existingFile" is created. Then the system tries to create the same file again.
+ * It is asserted that instead of creating a new instance of such a file, only its version is updated.
*/
@Test(enabled = true, dependsOnMethods = "testDeleteFile", description = "Creation of an existing file.")
public void testCreateExistingFile() {
@@ -244,7 +246,8 @@
}
/**
- * File creation and moving to default directory.
+ * File creation and moving to default directory. File named "fileToMove" is created in the root directory. Then the file is moved into the default directory.
+ * At the end it is asserted, that file is appearing in the "default" directory, but it's not existing in the root directory.
*/
@Test(enabled = true, description = "File creation and moving to default directory.")
public void testMoveFile() {
@@ -291,7 +294,8 @@
}
/**
- * File creation and copying to default directory.
+ * File creation and copying to default directory. File named "file2copy" is created in the root directory. Then the file is copied into the default directory.
+ * At the end it is asserted, that file is appearing in the both of "default" and the root directory.
*/
@Test(enabled = true, description = "File creation and copying to default directory.")
public void testCopyFile() {
@@ -357,8 +361,10 @@
}
/**
- * Simple file delete.
+ * Simple file delete. The file created by the {@link CMSFileTestCase#testCreateFile()} method is used to test the delete function.
+ * The test tries to delete the file, firstly canceling the deletion and then confirming the deletion in the second attempt.
*/
+ //TODO assert that file is deleted in the end
@Test(enabled = true, dependsOnMethods = "testCreateFile", description = "Simple file delete.")
public void testDeleteFile() {
selenium.click("link=Admin");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java 2009-04-06 13:03:58 UTC (rev 13164)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java 2009-04-06 14:33:48 UTC (rev 13165)
@@ -7,34 +7,48 @@
import org.testng.annotations.Test;
/**
+ * CMSFileUploadTestCase is responsible for testing of file uploading.
+ *
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
@Test(groups = { "cms_file_upload" }, enabled = true)
public class CMSFileUploadTestCase extends JBossPortalSeleniumTestCase {
- /* uncomment following lines and set the right path to the workspace in the case
- * you want to use this test case locally from eclipse */
/*
- {
- System.setProperty("workspace","/home/vrockai/workspace/selenium/selenium/"
- ); }
- */
+ * uncomment following lines and set the right path to the workspace in the
+ * case you want to use this test case locally from eclipse
+ */
+ /*
+ * {
+ * System.setProperty("workspace","/home/vrockai/workspace/selenium/selenium/"
+ * ); }
+ */
+
+ /** prefix for locator properties = cms.file.up. */
private final String casePfx = "cms.file.up.";
- private final String CMS_FILE_TABLE = getProp(casePfx+"cms.file.table","//div[@id='center']/div/div/div[3]/table");
+ private final String CMS_FILE_TABLE = getProp(casePfx + "cms.file.table", "//div[@id='center']/div/div/div[3]/table");
private final String WORKSPACE = System.getProperty("workspace");
@BeforeMethod(groups = { "log" })
- public void loginBeforeTest() {
+ protected void loginBeforeTest() {
logoutIfPossible();
login("admin", "admin");
}
@AfterMethod(groups = { "log" })
- public void logoutAfterTest() {
-
+ protected void logoutAfterTest() {
+
}
+ /**
+ * Canceling of file upload. The form for uploading file is filled with
+ * relevant values and the file located in "test_files/testFile.txt" is
+ * chosen for uploading into the default directory. Instead of submit
+ * button, the cancel button is pressed. The assertion are made to count the
+ * number of rows in file tables asserting the number of rows didn't change
+ * after canceling of upload.
+ */
@Test(enabled = true, description = "canceling of file upload")
public void testFileUploadCancel() {
selenium.click("link=Admin");
@@ -58,6 +72,7 @@
selenium.type("description", "myFile");
selenium.type("title", "file to upload");
selenium.select("language", "label=Afar");
+ selenium.type("response", WORKSPACE + "/test_files/testFile.txt");
selenium.click("link=default");
selenium.click("cancel");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -76,9 +91,16 @@
Assert.assertEquals(rc_d_after, rc_d_before, "The row count in CMS file table has changes after canceling the upload of file in the default dir.");
}
+ /**
+ * File upload test. The form for uploading file is filled with relevant
+ * values and the file located in "test_files/testFile.txt" is chosen for
+ * uploading into the root directory. Submit button is pressed and the
+ * upload should take the action. The existence of the file in root
+ * directory is asserted.
+ */
@Test(enabled = true, description = "File upload test")
public void testFileUpload() {
-
+
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=CMS");
@@ -90,14 +112,13 @@
selenium.type("description", "myFile");
selenium.type("title", "file to upload");
selenium.select("language", "label=Afar");
-
selenium.type("response", WORKSPACE + "/test_files/testFile.txt");
selenium.click("submit");
selenium.waitForPageToLoad(PAGE_LOAD);
-/*
- selenium.click("link=Approve");
- selenium.waitForPageToLoad(PAGE_LOAD);
-*/
+ /*
+ * selenium.click("link=Approve");
+ * selenium.waitForPageToLoad(PAGE_LOAD);
+ */
Assert.assertEquals(selenium.getText("//div[@id='center']/div/div/ul/li[3]"), "testFile.txt");
Assert.assertTrue(selenium.isElementPresent("link=text/plain"));
Assert.assertTrue(selenium.isElementPresent("//div[@id='center']/div/div/table/tbody/tr[4]/td[3]"));
@@ -111,5 +132,5 @@
Assert.assertEquals(selenium.getText("link=testFile.txt"), "testFile.txt");
}
-
+
}
Deleted: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSUserInterfaceTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSUserInterfaceTestCase.java 2009-04-06 13:03:58 UTC (rev 13164)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSUserInterfaceTestCase.java 2009-04-06 14:33:48 UTC (rev 13165)
@@ -1,21 +0,0 @@
-package org.jboss.portal.test.selenium.cms;
-import org.jboss.portal.test.selenium.JBossPortalSeleniumTestCase;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import com.thoughtworks.selenium.DefaultSelenium;
-import com.thoughtworks.selenium.Selenium;
-
-/**
- * @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
- */
-
-@Test(groups = { "cms_gui" }, enabled = true)
-
-public class CMSUserInterfaceTestCase {
-
-}
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r13164 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test/selenium and 2 other directories.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-04-06 09:03:58 -0400 (Mon, 06 Apr 2009)
New Revision: 13164
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesFullTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSExportFolderTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
Log:
[selenium] - new target for generating javadoc, some javadoc annotations in testclasses
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-04-06 11:41:15 UTC (rev 13163)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-04-06 13:03:58 UTC (rev 13164)
@@ -1,225 +1,235 @@
<project name="Tests" default="compile" basedir="." xmlns:server="http://jboss.org/ns/test/ant/server">
- <property environment="env" />
+ <property environment="env" />
- <property name="workspace" location="build.xml" />
- <property name="java.home" location="${env.JAVA_HOME}" />
+ <property name="workspace" location="build.xml" />
+ <property name="java.home" location="${env.JAVA_HOME}" />
- <property name="suitename" location="testng-files" />
- <property name="testname" location="testng-files" />
+ <property name="suitename" location="testng-files" />
+ <property name="testname" location="testng-files" />
- <property name="testng.dir" location="testng-files" />
- <property name="testng.output.dir" location="test-output" />
- <property name="testng.debug.dir" location="debug" />
- <property name="test.build.dir" location="output/classes" />
- <property name="test.src.dir" location="src" />
- <property name="lib.dir" location="lib" />
- <property name="hudson.lib.dir" location="/qa/tools/opt/" />
- <property name="jboss-test.jar" location="${hudson.lib.dir}/jboss-test.jar" />
- <available file="${jboss-test.jar}" property="jboss-test.jar.present" />
- <property name="junit.report.dir" location="test-report" />
+ <property name="testng.dir" location="testng-files" />
+ <property name="testng.output.dir" location="test-output" />
+ <property name="testng.debug.dir" location="debug" />
+ <property name="dir.javadoc" location="javadoc" />
+ <property name="test.build.dir" location="output/classes" />
+ <property name="test.src.dir" location="src" />
+ <property name="lib.dir" location="lib" />
+ <property name="hudson.lib.dir" location="/qa/tools/opt/" />
+ <property name="jboss-test.jar" location="${hudson.lib.dir}/jboss-test.jar" />
+ <available file="${jboss-test.jar}" property="jboss-test.jar.present" />
+ <property name="junit.report.dir" location="test-report" />
- <property name="selsrv.dir" location="selenium-rc-server" />
- <property name="node0" value="localhost" />
- <property name="jboss.test.home" value="${env.JBOSS_TEST_HOME}" />
- <property name="jboss.home" value="${env.JBOSS_HOME}" />
- <property name="jboss.test.jar" value="lib/jboss-test.jar" />
- <property name="jboss.portal.dir" value="${env.JBOSS_UNZIPED_DIR}" />
- <property name="portal_archive" value="${env.JBOSS_ARCHIVE}" />
- <property name="portal.instance" value="default" />
+ <property name="selsrv.dir" location="selenium-rc-server" />
+ <property name="node0" value="localhost" />
+ <property name="jboss.test.home" value="${env.JBOSS_TEST_HOME}" />
+ <property name="jboss.home" value="${env.JBOSS_HOME}" />
+ <property name="jboss.test.jar" value="lib/jboss-test.jar" />
+ <property name="jboss.portal.dir" value="${env.JBOSS_UNZIPED_DIR}" />
+ <property name="portal_archive" value="${env.JBOSS_ARCHIVE}" />
+ <property name="portal.instance" value="default" />
- <property name="test.suite" value="testng.xml" />
- <property name="usecase.suite" value="end2end.xml" />
+ <property name="test.suite" value="testng.xml" />
+ <property name="usecase.suite" value="end2end.xml" />
- <path id="jboss.test.classpath">
- <pathelement path="${jboss.test.jar}" />
- </path>
+ <path id="jboss.test.classpath">
+ <pathelement path="${jboss.test.jar}" />
+ </path>
- <path id="libraries.cp">
- <fileset dir="${lib.dir}">
- <include name="*.jar" />
- </fileset>
+ <path id="libraries.cp">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar" />
+ </fileset>
- </path>
+ </path>
- <path id="test.cp">
- <pathelement location="${test.build.dir}" />
- <path refid="libraries.cp" />
- </path>
+ <path id="test.cp">
+ <pathelement location="${test.build.dir}" />
+ <path refid="libraries.cp" />
+ </path>
- <taskdef name="testng" classpathref="libraries.cp" classname="org.testng.TestNGAntTask" />
- <taskdef name="config" classname="org.jboss.ant.taskdefs.server.ConfigManagerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
- <classpath id="server.taskdef.classpath">
- <path refid="jboss.test.classpath" />
- </classpath>
- </taskdef>
- <taskdef name="start" classname="org.jboss.ant.taskdefs.server.StartServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
- <classpath refid="server.taskdef.classpath" />
- </taskdef>
- <taskdef name="stop" classname="org.jboss.ant.taskdefs.server.StopServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
- <classpath refid="server.taskdef.classpath" />
- </taskdef>
+ <taskdef name="testng" classpathref="libraries.cp" classname="org.testng.TestNGAntTask" />
+ <taskdef name="config" classname="org.jboss.ant.taskdefs.server.ConfigManagerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
+ <classpath id="server.taskdef.classpath">
+ <path refid="jboss.test.classpath" />
+ </classpath>
+ </taskdef>
+ <taskdef name="start" classname="org.jboss.ant.taskdefs.server.StartServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
+ <classpath refid="server.taskdef.classpath" />
+ </taskdef>
+ <taskdef name="stop" classname="org.jboss.ant.taskdefs.server.StopServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
+ <classpath refid="server.taskdef.classpath" />
+ </taskdef>
- <target name="init">
- <echo message="Browser : ${browser}" />
- <echo message="Screenshot : ${screenshot}" />
- <echo message="Deleting testng report directory" />
- <delete dir="${testng.output.dir}" />
- <delete dir="${testng.debug.dir}" />
- </target>
+ <target name="init">
+ <echo message="Browser : ${browser}" />
+ <echo message="Screenshot : ${screenshot}" />
+ <echo message="Deleting testng report directory" />
+ <delete dir="${testng.output.dir}" />
+ <delete dir="${testng.debug.dir}" />
+ <delete dir="${dir.javadoc}" />
+ </target>
- <target name="compile" depends="">
- <echo message="Compiling testsuite" />
- <mkdir dir="${test.build.dir}" />
- <javac srcdir="${test.src.dir}" destdir="${test.build.dir}" classpathref="libraries.cp" debug="on" />
- <copy file="${test.src.dir}/org/jboss/portal/test/selenium/locator.properties" todir="${test.build.dir}/org/jboss/portal/test/selenium/"/>
- </target>
+ <target name="compile" depends="">
+ <echo message="Compiling testsuite" />
+ <mkdir dir="${test.build.dir}" />
+ <javac srcdir="${test.src.dir}" destdir="${test.build.dir}" classpathref="libraries.cp" debug="on" />
+ <copy file="${test.src.dir}/org/jboss/portal/test/selenium/locator.properties" todir="${test.build.dir}/org/jboss/portal/test/selenium/" />
+ </target>
- <target name="run-src">
- <echo message="Starting Selenium Remote Control" />
- <java jar="${selsrv.dir}/selenium-server.jar" fork="true" spawn="true">
- <arg value="-multiWindow" />
- <arg value="-port" />
- <arg value="44444" />
- <arg value="-log" />
- <arg value="selenium.log" />
- <arg value="-debug" />
- <arg value="-userExtensions" />
- <arg value="${selsrv.dir}/user-extensions.js" />
- </java>
- <sleep seconds="20" />
- </target>
+ <target name="javadoc" depends="">
+ <mkdir dir="${dir.javadoc}" />
+ <javadoc packagenames="org.jboss.portal.test.selenium.*" classpathref="libraries.cp" access="public" destdir="${dir.javadoc}" author="true" version="true" use="true">
+ <fileset dir="${test.src.dir}" defaultexcludes="yes">
+ <include name="**/*.java" />
+ </fileset>
+ </javadoc>
+ </target>
- <target name="stop-src">
- <get taskname="selenium-shutdown" src="http://localhost:44444/selenium-server/driver/?cmd=shutDown" dest="result.txt" ignoreerrors="true" />
- <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
- </target>
+ <target name="run-src">
+ <echo message="Starting Selenium Remote Control" />
+ <java jar="${selsrv.dir}/selenium-server.jar" fork="true" spawn="true">
+ <arg value="-multiWindow" />
+ <arg value="-port" />
+ <arg value="44444" />
+ <arg value="-log" />
+ <arg value="selenium.log" />
+ <arg value="-debug" />
+ <arg value="-userExtensions" />
+ <arg value="${selsrv.dir}/user-extensions.js" />
+ </java>
+ <sleep seconds="20" />
+ </target>
- <target name="copyApps">
- <echo message="Copying userInterceptor portlet into the ${portal.instance} server" />
- <copy file="apps/userDetail-portlet.war" tofile="${jboss.home}/server/${portal.instance}/deploy/userDetail-portlet.war" />
- </target>
+ <target name="stop-src">
+ <get taskname="selenium-shutdown" src="http://localhost:44444/selenium-server/driver/?cmd=shutDown" dest="result.txt" ignoreerrors="true" />
+ <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
+ </target>
- <target name="clean">
- <echo message="Going to delete directory ${test.build.dir}" />
- <delete dir="${test.build.dir}" />
- </target>
+ <target name="copyApps">
+ <echo message="Copying userInterceptor portlet into the ${portal.instance} server" />
+ <copy file="apps/userDetail-portlet.war" tofile="${jboss.home}/server/${portal.instance}/deploy/userDetail-portlet.war" />
+ </target>
- <server:config javaHome="${java.home}" jbossHome="${jboss.home}">
- <server name="${portal.instance}" host="${node0}">
+ <target name="clean">
+ <echo message="Going to delete directory ${test.build.dir}" />
+ <delete dir="${test.build.dir}" />
+ </target>
+
+ <server:config javaHome="${java.home}" jbossHome="${jboss.home}">
+ <server name="${portal.instance}" host="${node0}">
<!-- jvmarg value="${jpda.cmdline}" / -->
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=128m" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed" />
- </server>
- </server:config>
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=128m" />
+ <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed" />
+ </server>
+ </server:config>
- <target name="cleanup">
- <echo message="Cleaning up..." />
- <antcall target="stop-src" />
+ <target name="cleanup">
+ <echo message="Cleaning up..." />
+ <antcall target="stop-src" />
- </target>
+ </target>
- <target name="run-and-build" depends="init, compile, run-src">
- <echo message="Starting portal instance : ${portal.instance}" />
- <server:start name="${portal.instance}" />
+ <target name="run-and-build" depends="init, compile, run-src">
+ <echo message="Starting portal instance : ${portal.instance}" />
+ <server:start name="${portal.instance}" />
- <echo message="Runing TestNG" />
- <mkdir dir="test-output" />
- <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="test-output" listeners="org.testng.reporters.JUnitXMLReporter" suitename="SeleniumSuite">
+ <echo message="Runing TestNG" />
+ <mkdir dir="test-output" />
+ <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="test-output" listeners="org.testng.reporters.JUnitXMLReporter" suitename="SeleniumSuite">
- <xmlfileset dir="." includes="${testng.suite}" />
- <sysproperty key="browser" value="${browser}" />
- <sysproperty key="screenshot" value="${screenshot}" />
- <sysproperty key="workspace" value="${workspace}" />
- <sysproperty key="userCount" value="${userCount}" />
- <sysproperty key="html-src" value="${html-src}" />
- <sysproperty key="output-dir" value="${testng.output.dir}" />
- <jvmarg value="-ea" />
+ <xmlfileset dir="." includes="${testng.suite}" />
+ <sysproperty key="browser" value="${browser}" />
+ <sysproperty key="screenshot" value="${screenshot}" />
+ <sysproperty key="workspace" value="${workspace}" />
+ <sysproperty key="userCount" value="${userCount}" />
+ <sysproperty key="html-src" value="${html-src}" />
+ <sysproperty key="output-dir" value="${testng.output.dir}" />
+ <jvmarg value="-ea" />
- </testng>
- <echo message="Stoping portal instance : ${portal.instance}" />
- <server:stop name="${portal.instance}" />
- <antcall target="cleanup" />
- </target>
+ </testng>
+ <echo message="Stoping portal instance : ${portal.instance}" />
+ <server:stop name="${portal.instance}" />
+ <antcall target="cleanup" />
+ </target>
- <target name="single-test" depends="init, compile, run-src, copyApps">
- <echo message="Runing TestNG" />
+ <target name="single-test" depends="init, compile, run-src, copyApps">
+ <echo message="Runing TestNG" />
- <mkdir dir="test-output" />
- <mkdir dir="debug" />
- <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" listeners="org.jboss.portal.test.selenium.JBossSeleniumTestListener" suitename="SeleniumSingleTest" verbose="2">
+ <mkdir dir="test-output" />
+ <mkdir dir="debug" />
+ <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" listeners="org.jboss.portal.test.selenium.JBossSeleniumTestListener" suitename="SeleniumSingleTest" verbose="2">
- <classfileset dir="${test.build.dir}" includes="${testname}" />
- <sysproperty key="browser" value="${browser}" />
- <sysproperty key="screenshot" value="${screenshot}" />
- <sysproperty key="debug" value="${debug}" />
- <sysproperty key="workspace" value="${workspace}" />
- <sysproperty key="userCount" value="${userCount}" />
- <sysproperty key="html-src" value="${html-src}" />
- <sysproperty key="output-dir" value="${testng.output.dir}" />
- <jvmarg value="-ea" />
- </testng>
- <antcall target="cleanup" />
+ <classfileset dir="${test.build.dir}" includes="${testname}" />
+ <sysproperty key="browser" value="${browser}" />
+ <sysproperty key="screenshot" value="${screenshot}" />
+ <sysproperty key="debug" value="${debug}" />
+ <sysproperty key="workspace" value="${workspace}" />
+ <sysproperty key="userCount" value="${userCount}" />
+ <sysproperty key="html-src" value="${html-src}" />
+ <sysproperty key="output-dir" value="${testng.output.dir}" />
+ <jvmarg value="-ea" />
+ </testng>
+ <antcall target="cleanup" />
- </target>
+ </target>
- <target name="selenium-test" depends="init, compile, run-src, copyApps">
- <echo message="Runing TestNG" />
+ <target name="selenium-test" depends="init, compile, run-src, copyApps">
+ <echo message="Runing TestNG" />
- <mkdir dir="test-output" />
- <mkdir dir="debug" />
- <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" suitename="SeleniumSuite">
+ <mkdir dir="test-output" />
+ <mkdir dir="debug" />
+ <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" suitename="SeleniumSuite">
- <xmlfileset dir="." includes="${test.suite}" />
+ <xmlfileset dir="." includes="${test.suite}" />
- <sysproperty key="browser" value="${browser}" />
- <sysproperty key="screenshot" value="${screenshot}" />
- <sysproperty key="debug" value="${debug}" />
- <sysproperty key="workspace" value="${workspace}" />
- <sysproperty key="userCount" value="${userCount}" />
- <sysproperty key="html-src" value="${html-src}" />
- <sysproperty key="output-dir" value="${testng.output.dir}" />
-
+ <sysproperty key="browser" value="${browser}" />
+ <sysproperty key="screenshot" value="${screenshot}" />
+ <sysproperty key="debug" value="${debug}" />
+ <sysproperty key="workspace" value="${workspace}" />
+ <sysproperty key="userCount" value="${userCount}" />
+ <sysproperty key="html-src" value="${html-src}" />
+ <sysproperty key="output-dir" value="${testng.output.dir}" />
- <jvmarg value="-ea" />
+ <jvmarg value="-ea" />
- </testng>
- <antcall target="cleanup" />
- </target>
+ </testng>
+ <antcall target="cleanup" />
+ </target>
- <target name="selenium-usecase" depends="init, compile, run-src, copyApps">
- <echo message="Runing TestNG" />
+ <target name="selenium-usecase" depends="init, compile, run-src, copyApps">
+ <echo message="Runing TestNG" />
- <mkdir dir="test-output" />
- <mkdir dir="debug" />
-
- <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" suitename="SeleniumSuite">
+ <mkdir dir="test-output" />
+ <mkdir dir="debug" />
- <xmlfileset dir="." includes="${usecase.suite}" />
+ <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" suitename="SeleniumSuite">
- <sysproperty key="browser" value="${browser}" />
- <sysproperty key="screenshot" value="${screenshot}" />
- <sysproperty key="debug" value="${debug}" />
- <sysproperty key="workspace" value="${workspace}" />
- <sysproperty key="userCount" value="${userCount}" />
- <sysproperty key="html-src" value="${html-src}" />
- <sysproperty key="output-dir" value="${testng.output.dir}" />
- <jvmarg value="-ea" />
+ <xmlfileset dir="." includes="${usecase.suite}" />
- </testng>
- <antcall target="cleanup" />
- </target>
+ <sysproperty key="browser" value="${browser}" />
+ <sysproperty key="screenshot" value="${screenshot}" />
+ <sysproperty key="debug" value="${debug}" />
+ <sysproperty key="workspace" value="${workspace}" />
+ <sysproperty key="userCount" value="${userCount}" />
+ <sysproperty key="html-src" value="${html-src}" />
+ <sysproperty key="output-dir" value="${testng.output.dir}" />
+ <jvmarg value="-ea" />
- <target name="archive" >
- <!--<touch file="touchme.txt"/>-->
- <echo file="touchme.txt" message="pipik2"/>
- <genkey alias="apache-group" storepass="secret" dname="CN=Ant Group, OU=Jakarta Division, O=Apache.org, C=US"/>
- <echo message=""/>
- </target>
+ </testng>
+ <antcall target="cleanup" />
+ </target>
+ <target name="archive">
+ <!--<touch file="touchme.txt"/>-->
+ <echo file="touchme.txt" message="pipik2" />
+ <genkey alias="apache-group" storepass="secret" dname="CN=Ant Group, OU=Jakarta Division, O=Apache.org, C=US" />
+ <echo message="" />
+ </target>
+
</project>
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesFullTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesFullTestCase.java 2009-04-06 11:41:15 UTC (rev 13163)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesFullTestCase.java 2009-04-06 13:03:58 UTC (rev 13164)
@@ -9,7 +9,7 @@
import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
-@Test(groups = { "coordination_samples" }, enabled = true)
+@Test(groups = { "coordination_samples" }, enabled = false)
public class CoordinationSamplesFullTestCase extends JBossPortalSeleniumTestCase {
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesTestCase.java 2009-04-06 11:41:15 UTC (rev 13163)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesTestCase.java 2009-04-06 13:03:58 UTC (rev 13164)
@@ -9,6 +9,10 @@
import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
+/**
+ * The Class Coordination Samples TestCase is responsible for testing of coordination features of JBoss Portal using it's coordination samples page.
+ * In default state the page is available on address <a href="http://localhost:8080/portal/portal/default/Coordination+Samples">/portal/portal/default/Coordination+Samples</a>.
+ */
@Test(groups = { "coordination_samples" }, enabled = true)
public class CoordinationSamplesTestCase extends JBossPortalSeleniumTestCase {
@@ -75,16 +79,42 @@
private final String EVT_R_C3 = "Backpack";
@BeforeMethod(groups = { "log" })
- public void loginBeforeTest() {
+ protected void loginBeforeTest() {
selenium.open("/portal/portal/default/default");
selenium.waitForPageToLoad(PAGE_LOAD);
}
@AfterMethod(groups = { "log" })
- public void logoutAfterTest() {
+ protected void logoutAfterTest() {
}
+ /**
+ * Default coordination test is responsible for testing default coordination on the coordination samples page.
+ * It has to work with the default page <a href="http://localhost:8080/portal/portal/default/Coordination+Samples">/portal/portal/default/Coordination+Samples</a>.
+ * <br/>
+ * It starts with opening <a href="http://localhost:8080/portal/portal/default/Coordination+Samples?zip=78759">http://localhost:8080/portal/portal/default/Coordination+Samples?zip=78759</a>
+ * and checking that both variables on page have values asserted like this: <br/>
+ * <table>
+ * <tr>
+ * <td>Weather for (my_zipcode)</td><td>78759</td>
+ * </tr>
+ * <tr>
+ * <td>Map for (your_zipcode)</td><td>78759</td>
+ * </tr>
+ * </table>
+ * Then it fills up the <em>Page Parameter Portlet</em> with values:
+ * <table>
+ * <tr>
+ * <td>Page parameter name</td><td>xyz</td>
+ * </tr>
+ * <tr>
+ * <td>Page parameter value</td><td>123</td>
+ * </tr>
+ * </table>
+ *
+ * clicks on submit button and assert the url is in format <a href="http://localhost:8080//portal/portal/default/Coordination+Samples?xyz=123">/portal/portal/default/Coordination+Samples?xyz=123</a>
+ */
@Test(enabled = true)
public void defaultCoordinationTest() {
selenium.open("/portal/portal/default/Coordination+Samples");
@@ -103,6 +133,11 @@
Assert.assertTrue(selenium.getLocation().endsWith("/portal/portal/default/Coordination+Samples?xyz=123"));
}
+ /**
+ * Events explicit test.
+ *
+ * <h3>For the page: http://host:8080/portal/portal/default/Coordination+Samples/Events+-+Expl...</h3><p>This is demonstration of explicit event wiring.</p><ul><li>Click on "Add to Cart" on the Catalog Portlet on the left half for Snowboard.</li></ul><p> Assert that two Cart Portlets on the left half<strong> have Snowboard in them.</strong></p><p style="padding-left: 30px;"> Assert that two Cart Porlets on the right <strong>have "Cart is empty"</strong></p><ul><li>Click on "Add to Cart" on the Catalog Portlet on the right half for Tent.</li></ul><p> Assert that two Cart Portlets on the left half <strong>have no "Tent"</strong> in them</p><p style="padding-left: 30px;"> Assert that two Cart Porlets on the <strong>right have "Tent"</strong> in them.</p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p>
+ */
@Test(enabled = true)
public void eventsExplicitTest() {
selenium.click("link=Events - Explicit");
@@ -161,6 +196,11 @@
Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C3, 0) > 0);
}
+ /**
+ * Events fallback test.
+ *
+ * <h3>For the page: http://host:8080/portal/portal/default/Coordination+Samples/Events+-+Fall...</h3><p>This is demonstration of mix of both explicit and implicit. (Is there a better way to describe this?)</p><ul><li>Click on "Add to Cart" on the Catalog Portlet on the left half for Snowboard.</li></ul><p> Assert that two Cart Portlets on the left half<strong> have Snowboard in them.</strong></p><p style="padding-left: 30px;"> Assert that two Cart Porlets on the right <strong>have "Cart is empty"</strong></p><ul><li>Click on "Add to Cart" on the Catalog Portlet on the right half for Tent.</li></ul><p> Assert that two Cart Portlets on the left half <strong>have "Tent"</strong> in them</p><p style="padding-left: 30px;"> Assert that two Cart Porlets on the <strong>right have "Tent"</strong> in them.</p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p>
+ */
@Test(enabled = true)
public void eventsFallbackTest() {
selenium.click("link=Events - Fallback");
@@ -219,6 +259,11 @@
Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C3, 0) > 0);
}
+ /**
+ * Events implicit test.
+ *
+ * <h3>For the page: http://host:8080/portal/portal/default/Coordination+Samples/Events+-+Impl...</h3><p>This is implicit wiring which is the default wiring. Events are propagated based on their Qname regarless of which portlet generated the event.</p><ul><li>Click on "Add to Cart" on the Catalog Portlet on the left half for Snowboard.</li></ul><p> Assert that two Cart Portlets on the left half<strong> have Snowboard in them.</strong></p><p style="padding-left: 30px;"> Assert that two Cart Porlets on the right <strong>have Snowboard in them.</strong></p><ul><li>Click on "Add to Cart" on the Catalog Portlet on the right half for Tent.</li></ul><p> Assert that two Cart Portlets on the left half <strong>have "Tent"</strong> in them</p><p style="padding-left: 30px;"> Assert that two Cart Porlets on the <strong>right have "Tent"</strong> in them.</p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><h2><span><span style="color!
: #800000;">Parameters Binding:</span></span></h2>
+ */
@Test(enabled = true)
public void eventsImplicitTest() {
selenium.click("link=Events - Implicit");
@@ -301,6 +346,11 @@
Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C3, 0) > 0);
}
+ /**
+ * Parameter alias test.
+ *
+ * <h3>For the page: http://host:8080/portal/portal/default/Coordination+Samples/Parameters+-+...</h3><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><ul><li><span>Hit the URL </span><a class="jive-link-external-small" href="http://host:8080/portal/portal/default/Coordination+Samples/Parameters+-+...">http://host:8080/portal/portal/default/Coordination+Samples/Parameters+-+...</a><span>. Assert that </span><strong>"Viliam" is present</strong> in all PublicParametersPortletWindow for foo* parameters</li><li><span>Hit the URL </span><a class="jive-link-external-small" href="http://host:8080/portal/portal/default/Coordination+Samples/Parameters+-+...">http://host:8080/portal/portal/default/Coordination+Samples/Parameters+-+...</a><span>. Assert that </span><strong>"Prabhat" is present </strong>in all PublicParametersPortletWindow for juu* parameters and <strong>Viliam is not present</!
strong> in all PublicParametersPortletWindow for foo* parameters</li><li>Add "footest" for foo1 in PublicParametersPortletWindow1 and hit update. Assert that "footest" is present in all PublicParametersPortletWindow</li><li>Click on Remove link from PublicParametersPortletWindow4 for foo2. Assert that "footest" is removed from all PublicParametersPortletWindow.</li><li>In Page Parameters Portlet, add any parameter and value (xyz, 123) and verify that URL is changed (appended with ?xyz=123) once you hit update.</li></ul>
+ */
@Test(enabled = true)
public void parameterAliasTest() {
selenium.click("link=Parameters - Alias");
@@ -423,6 +473,11 @@
}
+ /**
+ * Parameter explicit test.
+ *
+ * <h3>For the page: http://host:8080/portal/portal/default/Coordination+Samples/Parameters+-+...</h3><ul><li><span>Hit the URL </span><a class="jive-link-external-small" href="http://host:8080/portal/portal/default/Coordination+Samples/Parameters+-+...">http://host:8080/portal/portal/default/Coordination+Samples/Parameters+-+...</a><span>. Assert that </span><strong>"Viliam" is present in Windows 1,2 and 3 but not in 4.</strong></li><li>Click on Remove link from Window 3 and assert that "Viliam" is not present in any of windows.</li><li><span>Hit the URL </span><a class="jive-link-external-small" href="http://host:8080/portal/portal/default/Coordination+Samples/Parameters+-+...">http://host:8080/portal/portal/default/Coordination+Samples/Parameters+-+...</a><span>. Assert that "Nepal" is present in Window1 for bar1, daa1 for Window2, bar2 for Window3, daa2 for Window4.</span><br/></li><!
li>In Page Parameters Portlet, add any parameter and value (xyz, 123) and verify that URL is changed (appended with ?xyz=123) once you hit update.</li></ul><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p>
+ */
@Test(enabled = true)
public void parameterExplicitTest() {
selenium.click("link=Parameters - Explicit+Alias");
@@ -521,6 +576,11 @@
Assert.assertTrue(selenium.getLocation().endsWith("Parameters+-+Explicit?xyz=123"));
}
+ /**
+ * Parameter explicit alias test.
+ *
+ * <h3>For the page: http://host:8080/portal/portal/default/Coordination+Samples/Parameters+-+...</h3><ul><li><span>Hit the URL </span><a class="jive-link-external-small" href="http://host:8080/portal/portal/portal/default/Coordination+Samples/Parame...">http://host:8080/portal/portal/portal/default/Coordination+Samples/Parame...</a><span>. Assert that </span><strong>"Prabhat" is present in Windows 1 for foo1 and in Windows2 for bar1.<br/></strong></li><li>Click on Remove link from Window 2 and assert that "Prabhat" is not present in any of windows.</li><li><span>Hit the URL </span><a class="jive-link-external-small" href="http://host:8080/portal/portal/portal/default/Coordination+Samples/Parame...">http://host:8080/portal/portal/portal/default/Coordination+Samples/Parame...</a><span>. Assert that "Thomas" is present!
in Window2, Window3 and Window4 but not in Window1. Since foo parameter in Window is part of binding1 and it's explicit binding, using binding2 does not have impact on foo parameter for window1.</span><br/> </li><li>In Page Parameters Portlet, add any parameter and value (xyz, 123) and verify that URL is changed (appended with ?xyz=123) once you hit update.</li></ul><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p>
+ */
@Test(enabled = true)
public void parameterExplicitAliasTest() {
selenium.click("link=Parameters - Explicit+Alias");
@@ -619,6 +679,11 @@
Assert.assertTrue(selenium.getLocation().endsWith("/portal/portal/default/Coordination+Samples/Parameters+-+Explicit%2BAlias?xyz=123"));
}
+ /**
+ * Parameter implicit test.
+ *
+ * <h3>For the page: http://host:8080/portal/portal/default/Coordination+Samples/Parameters+-+...</h3><ul><li>Add "footest" for foo1 in PublicParametersPortletWindow1 and hit update. Assert that "footest" is present in all PublicParametersPortletWindow</li><li>Click on Remove link from PublicParametersPortletWindow4 for foo2. Assert that "footest" is removed from all PublicParametersPortletWindow</li><li>Need clarification for the rest.</li></ul>
+ */
@Test(enabled = true)
public void parameterImplicitTest() {
selenium.click("link=Parameters - Implicit");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2009-04-06 11:41:15 UTC (rev 13163)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2009-04-06 13:03:58 UTC (rev 13164)
@@ -14,7 +14,7 @@
@Test(groups = { "login" }, enabled = true)
public class UserLoginTestCase extends JBossPortalSeleniumTestCase {
- /** prefix for locator properties */
+ /** prefix for locator properties = user.login.*/
public final String casePfx = "user.login.";
private final String ADR_PORTAL = getProp(casePfx+"adr.portal","/portal");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-04-06 11:41:15 UTC (rev 13163)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-04-06 13:03:58 UTC (rev 13164)
@@ -142,7 +142,7 @@
/**
* Test bea consumer deregister is responsible for deleting previously created BEA consumer.
- * It creates BEA consumer with name BEA and values similiar to that from {@link=testCreateBeaConsumer}.
+ * It creates BEA consumer with name BEA and values similiar to that from testCreateBeaConsumer.
* Then it clicks on deregister link for the consumer and checks whether deregister link has changed into register link.
*/
@Test(enabled = true, dependsOnMethods = { "testCreateBeaConsumer" }, description = "Standard BEA consumer deregistering.")
@@ -196,7 +196,7 @@
/**
* Test bea consumer deactivate is responsible for deactivating a bea consumer.
- * Firstly it creates bea consumer named <b>BEAact</b> with parameters similiar to that from {@link=testCreateBeaConsumer}.
+ * Firstly it creates bea consumer named <b>BEAact</b> with parameters similiar to that from testCreateBeaConsumer.
* Then it asserts that message signalling the consumer non-active state is missing.
* After clicking on deactivation link it assert, that the message signalling non-active state of consumer has appeared.
*/
@@ -236,7 +236,7 @@
/**
* Test bea consumer delete is responsible for deleting a bea consumer.
- * Firstly it creates bea consumer named <b>BEAdel</b> with parameters similiar to that from {@link=testCreateBeaConsumer}.
+ * Firstly it creates bea consumer named <b>BEAdel</b> with parameters similiar to that from testCreateBeaConsumer.
* It click on the delete icon for the consumer and then it asserts the consumer has disappeared from the table.
*/
@Test(enabled = true, dependsOnMethods = { "testCreateBeaConsumer" }, description = "Standard BEA consumer deleting.")
@@ -316,7 +316,7 @@
/**
* Test configure consumer is responsible for configuring bea consumer.
- * Firstly it creates bea consumer named <b>renameMe</b> with parameters similiar to that from {@link=testCreateBeaConsumer}.
+ * Firstly it creates bea consumer named <b>renameMe</b> with parameters similiar to that from testCreateBeaConsumer.
* Then it clicks on configure button for the consumer and rename it to <b>renameNewMe</b>.
* At the end it asserts that the previous name is missing in the consumers table and the new name has appeared.
*/
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-04-06 11:41:15 UTC (rev 13163)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-04-06 13:03:58 UTC (rev 13164)
@@ -7,25 +7,32 @@
import org.testng.annotations.Test;
/**
+ * CMSArchiveUploadTestCase is responsible for testing the upload of archives into JBoss Portal CMS. The test has set the selenium timeout of 10000ms due
+ * to CMS uploading speed limitation of portal. When no timeout is set, the testcase fails and crush the whole portal which is unusable after the crash.
+ *
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
-@Test(groups = { "cms_archive_upload" }, enabled = true)
+@Test(groups = { "cms_archive_upload" }, enabled = true, description="Testing the upload of archives into JBoss Portal CMS")
public class CMSArchiveUploadTestCase extends JBossPortalSeleniumTestCase {
- private static final Integer ARCHIVE_WAITING = 5000;
- private static final int n = 50;
+
+ /** The constant defining the wait time (in ms) between attempts when checking if the file was uploaded. */
+ public static final int ARCHIVE_WAITING = 5000;
+
+ /** The constant defining the the number of attempts when checking if the file was uploaded. */
+ public static final int ATTEMPTS = 50;
/*
* uncomment following lines and set the right path to the workspace in the
* case you want to use this test case locally from eclipse
*/
-/*
+ /*
{
System.setProperty("workspace", "/home/vrockai/workspace/p2.7tests/ui-tests/");
}
-*/
-
- private final String casePfx = "cms.arch.";
+ */
+ /** prefix for locator properties = cms.arch.*/
+ public final String casePfx = "cms.arch.";
private final String SUB_CANCEL_ARCH_UPLOAD = getProp(casePfx+"sub.cancel.arch.upload","cancel");
private final String LNK_ADMIN = getProp(casePfx+"lnk.admin","link=Admin");
private final String LNK_CMS = getProp(casePfx+"lnk.cms","link=CMS");
@@ -37,7 +44,7 @@
private final String WORKSPACE = System.getProperty("workspace");
@BeforeMethod(groups = { "log" })
- public void loginBeforeTest() {
+ protected void loginBeforeTest() {
logoutIfPossible();
login("admin", "admin");
// timeout hack
@@ -45,10 +52,19 @@
}
@AfterMethod(groups = { "log" })
- public void logoutAfterTest() {
+ protected void logoutAfterTest() {
}
+ /**
+ * Test archive consisting of two files upload.
+ * The archive used in this test consists of one directory containing two files - one image file and one plain text file.
+ * The test tries to upload the archive into the root directory of CMS structure.
+ * At first it cancels the uploading of the file and asserts the archive wasn't uploaded. At the second attempt it really
+ * uploads the file and asserts that both of the files are in their locations.
+ *
+ * The archive file can be found on "test_files/archive.zip".
+ */
@Test(enabled = true, description = "Test archive consisting of two files upload.")
public void testArchiveUpload() {
// canceling at the first stage
@@ -94,7 +110,7 @@
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
- if (i >= n) {
+ if (i >= ATTEMPTS) {
Assert.assertTrue(selenium.isElementPresent("link=archive"), "uploaded archive not found");
break;
}
@@ -112,6 +128,14 @@
Assert.assertTrue(selenium.isElementPresent("link=jbosslogo.png"), "content of uploaded file not found #2");
}
+ /**
+ * Test archive consisting of > 100 files upload.
+ * The archive used in this test consists of one directory containing more the 100 files in plain text format.
+ * The test tries to upload the archive into the root directory of CMS structure.
+ * It uploads the archive file and asserts that one of the files is in its location.
+ *
+ * The archive file can be found on "test_files/many_files.zip".
+ */
@Test(enabled = true, description = "Test archive consisting of > 100 files upload.")
public void testManyFilesArchiveUpload() {
@@ -138,7 +162,7 @@
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
- if (i >= n) {
+ if (i >= ATTEMPTS) {
Assert.assertTrue(selenium.isElementPresent("link=many_files"), "uploaded archive not found");
break;
}
@@ -154,6 +178,14 @@
Assert.assertTrue(selenium.isElementPresent("link=file31.txt"), "content of uploaded archive not found");
}
+ /**
+ * Test archive consisting of 21MB file upload.
+ * The archive used in this test consists of one directory containing one file which is larger then 21MB.
+ * The test tries to upload the archive into the root directory of CMS structure.
+ * It uploads the archive file and asserts that the file is in its location.
+ *
+ * The archive file can be found on "test_files/big_archive.zip".
+ */
@Test(enabled = true, description = "Test archive consisting of 21MB file upload.")
public void testBigArchiveUpload() {
@@ -180,7 +212,7 @@
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
- if (i >= n) {
+ if (i >= ATTEMPTS) {
Assert.assertTrue(selenium.isElementPresent("link=bigfile"), "uploaded archive not found");
break;
}
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java 2009-04-06 11:41:15 UTC (rev 13163)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java 2009-04-06 13:03:58 UTC (rev 13164)
@@ -7,12 +7,16 @@
import org.testng.annotations.Test;
/**
+ * CMSDirectoryTestCase is responsible for basic manipulation with directories in JBoss Portal CMS.
+ *
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
-
-@Test(groups = { "cms_directory" }, enabled = true)
+//TODO refactoring of proeprties needed
+@Test(groups = { "cms_directory" }, enabled = true, description="Basic manipulation with directories in JBoss Portal CMS")
public class CMSDirectoryTestCase extends JBossPortalSeleniumTestCase {
- private final String casePfx = "cms.dir.";
+
+ /** prefix for locator properties = cms.dir.*/
+ public final String casePfx = "cms.dir.";
private final String SEL_CMS_ACTION = getProp(casePfx + "sel.cms.action", "//div[@id='center']/div/div/div[1]/div/select");
private final String ADR_CMS_INTERFACE = getProp(casePfx + "adr.cms.interface", "/portal/auth/portal/admin/CMS");
@@ -24,20 +28,28 @@
private final String CMS_FILE_TABLE = getProp(casePfx + "cms.file.table", "//div[@id='center']/div/div/div[3]/table");
@BeforeMethod(groups = { "log" })
- public void loginBeforeTest() {
+ protected void loginBeforeTest() {
logoutIfPossible();
login("admin", "admin");
}
@AfterMethod(groups = { "log" })
- public void logoutAfterTest() {
+ protected void logoutAfterTest() {
}
+ /**
+ * Creates a directory.
+ *
+ * With action selector an action to create a directory is chosen.
+ * Directory named "tempDir" with description "test folder" is filled in to the directory creation form, but in the first attempt, the creation is canceled.
+ * In the second attempt, the directory is created. Then the name of a directory in the home directory is asserted.
+ */
+ //TODO asserts in the end have to be redone
@Test(enabled = true, description = "Directory creation.")
public void testCreateDirectory() {
- // cancelling of creating
+ // canceling of creating
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -77,7 +89,7 @@
selenium.type("newcollectiondescription", "test folder");
selenium.click("submit");
- // assuring that the directory is deleted
+ // assuring that the directory is created
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isElementPresent("//div[@id='center']/div/div/ul/li[3]"));
@@ -88,6 +100,13 @@
}
+ /**
+ * Deletes a directory.
+ *
+ * With action selector an action to delete a directory is chosen. The directory had to be deleted was created with {@link CMSDirectoryTestCase#testCreateDirectory()}.
+ * At first, after warning message, the directory is not deleted, the deletion is canceled. At the second attempt
+ * the deletion is done. Then the name of a directory in the home directory is asserted not to appear there.
+ */
@Test(enabled = true, dependsOnMethods = "testCreateDirectory", description = "Directory delete.")
public void testDeleteDirectory() {
@@ -143,6 +162,12 @@
Assert.assertFalse(selenium.isElementPresent("link=" + tempDirName));
}
+ /**
+ * Copies a directory.
+ *
+ * With action selector an action to copy a directory is chosen. Before that a directory named "copySrc" was created.
+ * Then it was copied into "default" directory. Then the existence of the copied directory in both root and default directories is asserted.
+ */
@Test(enabled = true, dependsOnMethods = "testCreateDirectory", description = "Copying of directory.")
public void testCopyDirectory() {
selenium.click("link=Admin");
@@ -186,6 +211,12 @@
}
+ /**
+ * Cancels the copying of a directory.
+ *
+ * With action selector an action to copy a directory is chosen. The copying is canceled with cancel button.
+ * Assertion making sure the directory was not copied are then applied.
+ */
@Test(enabled = true, dependsOnMethods = "testCreateDirectory", description = "Canceling of copying of directory.")
public void testCopyCancelDirectory() {
String copyCancelDirName = "L" + "copyLDirName" + "Cancel";
@@ -227,6 +258,12 @@
}
+ /**
+ * Moves a directory.
+ *
+ * With action selector an action to move a directory is chosen. Before that a directory named "moveSrc" was created.
+ * Then it was copied into "default" directory. Then the existence of the moved directory in default and not in the root directory is asserted.
+ */
@Test(enabled = true, dependsOnMethods = "testCreateDirectory", description = "Moving a directory.")
public void testMoveDirectory() {
// selenium.setSpeed("3000");
@@ -274,6 +311,12 @@
}
+ /**
+ * Cancels the moving of a directory.
+ *
+ * With action selector an action to move a directory is chosen. The copying is canceled with cancel button.
+ * Assertion making sure the directory was not moved are then applied.
+ */
@Test(enabled = true, dependsOnMethods = "testCreateDirectory", description = "Canceling of moving a directory.")
public void testMoveCancelDirectory() {
String moveCancelDirName = "X" + "moveXDirName" + "Cancel";
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSExportFolderTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSExportFolderTestCase.java 2009-04-06 11:41:15 UTC (rev 13163)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSExportFolderTestCase.java 2009-04-06 13:03:58 UTC (rev 13164)
@@ -11,6 +11,9 @@
import com.thoughtworks.selenium.Selenium;
/**
+ * CMSExportFolderTestCase should tests the exporting of directories in JBoss Portal CMS.
+ * Unfortunatelly selenium is not capable to deal with such a task. The testcase is empty.
+ *
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2009-04-06 11:41:15 UTC (rev 13163)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2009-04-06 13:03:58 UTC (rev 13164)
@@ -7,29 +7,38 @@
import org.testng.annotations.Test;
/**
+ * CMSFileTestCase is used to test basic file manipulation in JBoss Portal CMS
+ * with the workflow turned off.
+ *
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
-
-@Test(groups = { "cms_file" }, enabled = true)
+// TODO refactoring of field needed
+@Test(groups = { "cms_file" }, enabled = true, description = "Basic file manipulation in JBoss Portal CMS")
public class CMSFileTestCase extends JBossPortalSeleniumTestCase {
+ /** prefix for locator properties = cms.file. */
private final String casePfx = "cms.file.";
- private final String TBL_CMS_FILEVER = getProp(casePfx+"tbl.cms.filever","//div[@id='center']/div/div/table");
- public final String TBL_CMS_FILE = getProp(casePfx+"tbl.cms.file","//div[@id='center']/div/div/div[3]/table");
- public final String TBL_FILE_PENDING = getProp(casePfx+"tbl.file.pending","//div[@id='center']/div/div/table[2]");
-
+ private final String TBL_CMS_FILEVER = getProp(casePfx + "tbl.cms.filever", "//div[@id='center']/div/div/table");
+ public final String TBL_CMS_FILE = getProp(casePfx + "tbl.cms.file", "//div[@id='center']/div/div/div[3]/table");
+ public final String TBL_FILE_PENDING = getProp(casePfx + "tbl.file.pending", "//div[@id='center']/div/div/table[2]");
+
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
logoutIfPossible();
login("admin", "admin");
- }
-
- @AfterMethod( groups = { "log" })
+ }
+
+ @AfterMethod(groups = { "log" })
public void logoutAfterTest() {
-
+
}
-
+
+ /**
+ * Common file structure browsing test. Simple clicking on default CMS
+ * structure of directories and files, asserting that elements are on right
+ * places.
+ */
@Test(enabled = true, description = "Common file structure browsing test.")
public void testDefaultBrowsing() {
selenium.click("link=Admin");
@@ -44,7 +53,7 @@
Assert.assertTrue(selenium.isElementPresent("link=private"));
Assert.assertTrue(selenium.isElementPresent("link=index.html"));
Assert.assertTrue(selenium.isElementPresent("link=project.html"));
- //Assert.assertTrue(selenium.isElementPresent("link=support.html"));
+ // Assert.assertTrue(selenium.isElementPresent("link=support.html"));
selenium.click("link=index.html");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isElementPresent("link=text/html"));
@@ -59,6 +68,9 @@
Assert.assertTrue(selenium.isElementPresent("link=jbosslogo.png"));
}
+ /**
+ * File properties checking. Clicking on index.html file and asserting that its properties (language, type, size, ...) are in default state.
+ */
@Test(enabled = true, description = "File properties checking.")
public void testFileProperties() {
selenium.click("link=Admin");
@@ -67,14 +79,12 @@
selenium.click("link=CMS");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.open("/portal/auth/portal/admin/CMS/CMSAdminPortletWindow?op=main&action=2&path=%2F");
+ //selenium.open("/portal/auth/portal/admin/CMS/CMSAdminPortletWindow?op=main&action=2&path=%2F");
selenium.click("link=default");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=index.html");
selenium.waitForPageToLoad(PAGE_LOAD);
-
-
-
+
Assert.assertEquals("text/html", selenium.getText("link=text/html"));
Assert.assertEquals("English", selenium.getText("link=English"));
Assert.assertEquals("Type", selenium.getText("//div[@id='center']/div/div/table/tbody/tr[3]/td[1]/b"));
@@ -99,6 +109,27 @@
}
+ /**
+ * Simple file creation. File named "newFile" is created in the root directory of CMS module with main action selector.
+ * Attributes of the created file:
+ * <table>
+ * <tr>
+ * <td>filename</td><td>newFile</td>
+ * </tr>
+ * <tr>
+ * <td>description</td><td>newFile description</td>
+ * </tr>
+ * <tr>
+ * <td>title</td><td>newFile title</td>
+ * </tr>
+ * <tr>
+ * <td>language</td><td>Czech</td>
+ * </tr>
+ * </table>
+ *
+ * After the creation, the properties of the file are asserted to be the same as in the table above.
+ *
+ */
@Test(enabled = true, description = "Simple file creation.")
public void testCreateFile() {
selenium.click("link=Admin");
@@ -115,28 +146,32 @@
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
/*
- Assert.assertTrue(selenium.isElementPresent(TBL_FILE_PENDING));
- Assert.assertTrue(findTableRow(TBL_FILE_PENDING, "text/plain", 0) >= 0);
- Assert.assertTrue(findTableRow(TBL_FILE_PENDING, "0kb", 1) >= 0);
- //Assert.assertTrue(findTableRow(CMS_FILE_PENDING_TABLE, "admin", 3) >= 0);
-
- selenium.click("link=Approve");
- selenium.waitForPageToLoad(PAGE_LOAD);
- */
-
+ * Assert.assertTrue(selenium.isElementPresent(TBL_FILE_PENDING));
+ * Assert.assertTrue(findTableRow(TBL_FILE_PENDING, "text/plain", 0) >=
+ * 0); Assert.assertTrue(findTableRow(TBL_FILE_PENDING, "0kb", 1) >= 0);
+ * //Assert.assertTrue(findTableRow(CMS_FILE_PENDING_TABLE, "admin", 3)
+ * >= 0);
+ *
+ * selenium.click("link=Approve");
+ * selenium.waitForPageToLoad(PAGE_LOAD);
+ */
+
Assert.assertEquals("Czech", selenium.getText("link=Czech"));
- Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "text/plain", 0)>=0);
- Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "0kb", 1)>=0);
- Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "1.0", 2)>=0);
- Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "newFile title", 5)>=0);
-
+ Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "text/plain", 0) >= 0);
+ Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "0kb", 1) >= 0);
+ Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "1.0", 2) >= 0);
+ Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "newFile title", 5) >= 0);
+
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("newFile", selenium.getText("link=newFile"));
}
-
- @Test(enabled = true, description = "Editing of file.")
+
+ /**
+ * Editing of a file.
+ */
+ @Test(enabled = true, description = "Editing of a file.")
public void testEditFile() {
selenium.click("link=Admin");
@@ -152,30 +187,32 @@
selenium.select("language", "label=Czech");
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
-
- int row = findTableRow(TBL_CMS_FILEVER, "1.0", 2)+1;
-
+
+ int row = findTableRow(TBL_CMS_FILEVER, "1.0", 2) + 1;
+
Assert.assertEquals("Czech", selenium.getText("link=Czech"));
Assert.assertEquals("text/plain", selenium.getText("link=text/plain"));
- Assert.assertEquals("1.0", selenium.getText("//div[@id='center']/div/div/table/tbody/tr["+ row +"]/td[3]"));
- Assert.assertEquals("0kb", selenium.getText("//div[@id='center']/div/div/table/tbody/tr["+ row +"]/td[2]"));
- Assert.assertEquals("file2edit title", selenium.getText("//div[@id='center']/div/div/table/tbody/tr["+ row +"]/td[6]"));
-
+ Assert.assertEquals("1.0", selenium.getText("//div[@id='center']/div/div/table/tbody/tr[" + row + "]/td[3]"));
+ Assert.assertEquals("0kb", selenium.getText("//div[@id='center']/div/div/table/tbody/tr[" + row + "]/td[2]"));
+ Assert.assertEquals("file2edit title", selenium.getText("//div[@id='center']/div/div/table/tbody/tr[" + row + "]/td[6]"));
+
selenium.click("link=text/plain");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("1.1"));
Assert.assertTrue(selenium.isElementPresent("//div[@id='center']/div/div/table/tbody/tr[5]/td[3]/img"));
-
-
+
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("file2edit", selenium.getText("link=file2edit"));
}
- @Test(enabled = true, dependsOnMethods = "testDeleteFile", description = "Creation of existing file.")
+ /**
+ * Creation of an existing file.
+ */
+ @Test(enabled = true, dependsOnMethods = "testDeleteFile", description = "Creation of an existing file.")
public void testCreateExistingFile() {
String filename = "existingFile";
@@ -206,6 +243,9 @@
deleteFile(filename);
}
+ /**
+ * File creation and moving to default directory.
+ */
@Test(enabled = true, description = "File creation and moving to default directory.")
public void testMoveFile() {
selenium.click("link=Admin");
@@ -229,27 +269,30 @@
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("fileToMove", selenium.getText("link=fileToMove"));
-
- int row = findTableRow(TBL_CMS_FILE, "fileToMove", 0)+1;
-
- selenium.select("//div[@id='center']/div/div/div[3]/table/tbody/tr["+row+"]/td[2]/form/select", "label=Move");
- selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr["+row+"]/td[2]/form/select/option[3]");
- selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr["+row+"]/td[2]/form/input");
+
+ int row = findTableRow(TBL_CMS_FILE, "fileToMove", 0) + 1;
+
+ selenium.select("//div[@id='center']/div/div/div[3]/table/tbody/tr[" + row + "]/td[2]/form/select", "label=Move");
+ selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr[" + row + "]/td[2]/form/select/option[3]");
+ selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr[" + row + "]/td[2]/form/input");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=default");
selenium.click("submit");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=default");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isElementPresent("link=fileToMove"));
-
+
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertFalse(selenium.isElementPresent("link=fileToMove"));
}
-
+
+ /**
+ * File creation and copying to default directory.
+ */
@Test(enabled = true, description = "File creation and copying to default directory.")
public void testCopyFile() {
selenium.click("link=Admin");
@@ -265,48 +308,57 @@
selenium.select("language", "label=Czech");
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
-
- int row = findTableRow(TBL_CMS_FILEVER, "1.0", 2)+1;
-
+
+ int row = findTableRow(TBL_CMS_FILEVER, "1.0", 2) + 1;
+
Assert.assertEquals("Czech", selenium.getText("link=Czech"));
Assert.assertEquals("text/plain", selenium.getText("link=text/plain"));
- Assert.assertEquals("1.0", selenium.getText("//div[@id='center']/div/div/table/tbody/tr["+row+"]/td[3]"));
- Assert.assertEquals("0kb", selenium.getText("//div[@id='center']/div/div/table/tbody/tr["+row+"]/td[2]"));
- Assert.assertEquals("file2copy title", selenium.getText("//div[@id='center']/div/div/table/tbody/tr["+row+"]/td[6]"));
+ Assert.assertEquals("1.0", selenium.getText("//div[@id='center']/div/div/table/tbody/tr[" + row + "]/td[3]"));
+ Assert.assertEquals("0kb", selenium.getText("//div[@id='center']/div/div/table/tbody/tr[" + row + "]/td[2]"));
+ Assert.assertEquals("file2copy title", selenium.getText("//div[@id='center']/div/div/table/tbody/tr[" + row + "]/td[6]"));
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("file2copy", selenium.getText("link=file2copy"));
-
- row = findTableRow(TBL_CMS_FILE, "file2copy", 0)+1;
-
- selenium.select("//div[@id='center']/div/div/div[3]/table/tbody/tr["+row+"]/td[2]/form/select", "label=Copy");
- selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr["+row+"]/td[2]/form/select/option[3]");
- selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr["+row+"]/td[2]/form/input");
+
+ row = findTableRow(TBL_CMS_FILE, "file2copy", 0) + 1;
+
+ selenium.select("//div[@id='center']/div/div/div[3]/table/tbody/tr[" + row + "]/td[2]/form/select", "label=Copy");
+ selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr[" + row + "]/td[2]/form/select/option[3]");
+ selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr[" + row + "]/td[2]/form/input");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=default");
selenium.click("submit");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=default");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isElementPresent("link=file2copy"));
-
+
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isElementPresent("link=file2copy"));
}
+ /**
+ * Not implemented!
+ */
@Test(enabled = false, description = "Not implemented!")
public void testMoveOverwriteFile() {
}
+ /**
+ * Not implemented!
+ */
@Test(enabled = false, description = "Not implemented!")
public void testMoveNotOverwriteFile() {
}
+ /**
+ * Simple file delete.
+ */
@Test(enabled = true, dependsOnMethods = "testCreateFile", description = "Simple file delete.")
public void testDeleteFile() {
selenium.click("link=Admin");
@@ -335,6 +387,9 @@
selenium.waitForPageToLoad(PAGE_LOAD);
}
+ /**
+ * Not implemented!
+ */
@Test(enabled = false)
public void testDeleteCancelFile() {
@@ -363,7 +418,8 @@
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals(name, selenium.getText("link=" + name));
- logout();login("admin","admin");
+ logout();
+ login("admin", "admin");
}
private void deleteFile(String name) {
@@ -382,6 +438,7 @@
Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this resource?"));
selenium.click("submit");
selenium.waitForPageToLoad(PAGE_LOAD);
- logout();login("admin","admin");
+ logout();
+ login("admin", "admin");
}
}
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-04-06 11:41:15 UTC (rev 13163)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-04-06 13:03:58 UTC (rev 13164)
@@ -9,11 +9,14 @@
import org.testng.annotations.Test;
/**
+ * AdminPortalTestCase is responsible for testing fundamental portal admin features of JBoss Portal.
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
+ *
*/
@Test(groups = { "admin_portal" }, enabled = true, description = "Partal administrating.")
public class AdminPortalTestCase extends JBossPortalSeleniumTestCase {
+ /** prefix for locator properties = portal.admin.*/
public final String casePfx = "portal.admin.";
private final String LNK_PP_PROP_DELETE = getProp(casePfx+"lnk.pp.prop.delete","//a[contains(@id,''common-manage-prop-form:prop-data-table:{0}:delete'')]");
@@ -83,16 +86,24 @@
private final String PAG_TL_MAKEDEF = getProp(casePfx + "pag.tl.makedef", "//a[contains(@id,''obj-nav-form:pages-datatable:{0}:default-link'')]");
@BeforeMethod(groups = { "log" })
- public void loginBeforeTest() {
+ protected void loginBeforeTest() {
logoutIfPossible();
login("admin", "admin");
}
@AfterMethod(groups = { "log" })
- public void logoutAfterTest() {
+ protected void logoutAfterTest() {
}
- @Test(enabled = true)
+ /**
+ * Creates a new portal.
+ *
+ * Uses portal admin interface to create a new portal.
+ * TODO: the existence of new portal should be tested in a more stronger way. The test only asserts the existence of portal name in the portals table
+ * and it asserts the existence of it's tool links, too.
+ */
+ //TODO: the existence of new portal should be tested in a more stronger way
+ @Test(enabled = true, description="Creates a new portal")
public void testPortalCreate() {
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -121,7 +132,13 @@
Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_THEME, r)));
}
- @Test(enabled = true, dependsOnMethods = { "testPortalCreate" })
+ /**
+ * Renames a portal. Firstly a portal name "TestRenPortal" is created the same way as in {@link AdminPortalTestCase#testPortalCreate()}.
+ * In portal admin interface, rename link is used to rename the portal to "AestPortal".
+ * At the end it checks that the former name of portal is not on the screen and the new name is appearing when listing portals.
+ */
+ //TODO findintable should be used for final assertions
+ @Test(enabled = true, dependsOnMethods = { "testPortalCreate" }, description="Renames a portal")
public void testPortalRename() {
// first create a portal
@@ -149,7 +166,7 @@
final String portalToRename = "TestRenPortal";
Assert.assertTrue(selenium.isTextPresent(portalToRename));
final String portalRenamed = "AestPortal";
- Assert.assertFalse(selenium.isTextPresent(portalRenamed), "Not created page already exist.");
+ Assert.assertFalse(selenium.isTextPresent(portalRenamed), "Not renamed page already exist.");
int r = findTableRow(TABLE_PORTAL_ADMIN, portalToRename, 0) - 1;
@@ -164,7 +181,13 @@
Assert.assertTrue(selenium.isTextPresent(portalRenamed));
}
- @Test(enabled = true, dependsOnMethods = { "testPortalCreate" })
+ /**
+ * Deletes a portal. Firstly a portal name "TestDelete" is created the same way as in {@link AdminPortalTestCase#testPortalCreate()}.
+ * In portal admin interface, delete link is used to delete the portal.
+ * At the end it checks that the former name of portal is not on the screen.
+ */
+ //TODO findintable should be used for final assertions
+ @Test(enabled = true, dependsOnMethods = { "testPortalCreate" }, description="Deletes a portal")
public void testPortalDelete() {
// first create a portal
@@ -214,7 +237,16 @@
}
- @Test(enabled = true, dependsOnMethods = { "testPortalCreate" })
+ /**
+ * Testing properties of portal. Firstly a portal name "TestProperties" is created the same way as in {@link AdminPortalTestCase#testPortalCreate()}.
+ * In portal admin interface, properties link is used to delete the portal. Following actions are then proceeded and their final states are asserted after logout/login:
+ * <ul>
+ * <li>change listener at first to release_sessions_listener_self and then to user_listener.</li>
+ * <li>add two properties: viliamProp/hier! and danielProp/ohne! and then delete viliamProp.</li>
+ * <li>change everything in Portal & Page Error Handling tables.</li>
+ * </ul>
+ */
+ @Test(enabled = true, dependsOnMethods = { "testPortalCreate" }, description="Testing properties of portal")
public void testPortalProperties() {
// first create a portal
@@ -275,6 +307,7 @@
selenium.type(MessageFormat.format(INP_PP_PROP_VAL,r), propVal1);
selenium.click(SUB_PP_PROPVAL_UPDATE);
selenium.waitForPageToLoad(PAGE_LOAD);
+
selenium.type(INP_PP_PROPNAME, propName2);
selenium.click(SUB_PP_PROPADD);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -403,7 +436,13 @@
}
- @Test(enabled = true, dependsOnMethods = { "testPortalCreate" })
+ /**
+ * Adds a page to a portal. Firstly a portal name "TestAddPagePortal" is created the same way as in {@link AdminPortalTestCase#testPortalCreate()}.
+ * In portal admin interface, main link (title of portal) is used to navigate to its own tools. Form for creation of new page is then used
+ * to create page named "tToAddPage". At the end it checks that the name of pa is is appearing in "TestAddPagePortal" portal pages list.
+ */
+ //TODO findintable should be used for final assertions
+ @Test(enabled = true, dependsOnMethods = { "testPortalCreate" }, description="Adds a page to a portal")
public void testAddPage() {
final String portalName = "TestAddPagePortal";
@@ -433,7 +472,14 @@
Assert.assertTrue(selenium.isTextPresent(portalPage));
}
- @Test(enabled = true, dependsOnMethods = { "testPortalCreate", "testAddPage" })
+ /**
+ * Removes a page from a portal. Firstly a portal name "TestRemovePagePortal" is created the same way as in {@link AdminPortalTestCase#testPortalCreate()}.
+ * In portal admin interface, main link (title of portal) is used to navigate to its own tools. Form for creation of new page is then used
+ * to create page named "tRemPage" the same way as in {@link AdminPortalTestCase#testAddPage()}. The page is removed with the remove button afterwards.
+ * At the end it checks that the name of page is not appearing in "TestRemovePagePortal" portal pages list.
+ */
+ //TODO findintable should be used for final assertions
+ @Test(enabled = true, dependsOnMethods = { "testPortalCreate", "testAddPage" }, description="Removes a page from a portal")
public void testRemovePage() {
final String portalName = "TestRemovePagePortal";
@@ -465,7 +511,14 @@
}
- @Test(enabled = true, dependsOnMethods = { "testPortalCreate", "testAddPage" })
+ /**
+ * Creates a "window" on a page. Firstly a portal name "toAddWindowPortal" is created the same way as in {@link AdminPortalTestCase#testPortalCreate()}.
+ * In portal admin interface, main link (title of portal) is used to navigate to its own tools. Form for creation of new page is then used
+ * to create page named "windowContainer" the same way as in {@link AdminPortalTestCase#testAddPage()}. The link "page layout" of "testAddPage"
+ * page is then clicked to add a window to this page. "Who's online portlet" is then added to windows called "myFancyWindow" on this page.
+ * Existence of text containing the name of window is asserted. At the page is loaded and the existence of the added portlet is asserted.
+ */
+ @Test(enabled = true, dependsOnMethods = { "testPortalCreate", "testAddPage" }, description="Creates a \"window\" on a page")
public void testCreateWindow() {
final String portalName = "toAddWindowPortal";
@@ -515,7 +568,15 @@
}
- @Test(enabled = true, dependsOnMethods = { "testPortalCreate", "testAddPage" })
+ /**
+ * Renames a page of a portal. Firstly a portal name "TestPortal" is created the same way as in {@link AdminPortalTestCase#testPortalCreate()}.
+ * In portal admin interface, main link (title of portal) is used to navigate to its own tools. Form for creation of new page is then used
+ * to create page named "PageToRename" the same way as in {@link AdminPortalTestCase#testAddPage()}.
+ *
+ * The rename link on the page is then clicked. Most of the <b>TEST CODE IS MISSING!</b>
+ */
+ //TODO MUST FINISH!
+ @Test(enabled = true, dependsOnMethods = { "testPortalCreate", "testAddPage" }, description="Renames a page of a portal")
public void testPageRename() {
String portalName = "TestPortal";
String pageName = "PageToRename";
@@ -540,15 +601,27 @@
}
- @Test(enabled = false)
+ //TODO TEST CODE IS MISSING!
+ /**
+ * TEST CODE IS MISSING!
+ */
+ @Test(enabled = false, description="")
public void testPageSecurity() {
}
-
- @Test(enabled = false)
+
+ /**
+ * TEST CODE IS MISSING!
+ */
+ //TODO TEST CODE IS MISSING!
+ @Test(enabled = false, description="")
public void testPageTheme() {
}
- @Test(enabled = false)
+ /**
+ * TEST CODE IS MISSING!
+ */
+ //TODO TEST CODE IS MISSING!
+ @Test(enabled = false, description="")
public void testPageLayout() {
}
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r13163 - in branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp: producer and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-06 07:41:15 -0400 (Mon, 06 Apr 2009)
New Revision: 13163
Modified:
branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java
branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java
branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java
branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java
branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java
branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java
branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPPortletInvocationContext.java
Log:
JBEPP-59: JBoss Portal WSRP id namespacing is causing issues with some other WSRP implementations
Modified: branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java 2009-04-06 11:37:18 UTC (rev 13162)
+++ branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java 2009-04-06 11:41:15 UTC (rev 13163)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -27,10 +27,8 @@
import org.apache.commons.fileupload.FileItemStream;
import org.apache.commons.fileupload.FileUpload;
import org.apache.commons.fileupload.util.Streams;
-import org.jboss.portal.common.util.ParameterMap;
import org.jboss.portal.common.util.ParameterValidation;
import org.jboss.portal.portlet.OpaqueStateString;
-import org.jboss.portal.portlet.ParametersStateString;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateEvent;
import org.jboss.portal.portlet.StateString;
@@ -102,7 +100,7 @@
if (interactionState != null)
{
String state = interactionState.getStringValue();
- if (!ParametersStateString.JBPNS_PREFIX.equals(state)) // fix-me: see JBPORTAL-900
+ if (!StateString.JBPNS_PREFIX.equals(state)) // fix-me: see JBPORTAL-900
{
interactionParams.setInteractionState(state);
}
Modified: branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java 2009-04-06 11:37:18 UTC (rev 13162)
+++ branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java 2009-04-06 11:41:15 UTC (rev 13163)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -25,7 +25,6 @@
import org.jboss.logging.Logger;
import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.impl.jsr168.PortletUtils;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.ErrorResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
@@ -149,7 +148,17 @@
protected String getNamespaceFrom(WindowContext windowContext)
{
- return windowContext == null ? null : PortletUtils.generateNamespaceFrom(windowContext.getId());
+ // todo: use URLTools.EncodeForHTMLId when it's available in common
+ if (windowContext != null)
+ {
+ String id = windowContext.getId();
+ id = id.replace('=', '_');
+ id = id.replace('/', '_');
+ id = id.replace('.', '_');
+ return id.replace('+', '_');
+ }
+
+ return null;
}
/**
Modified: branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java 2009-04-06 11:37:18 UTC (rev 13162)
+++ branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java 2009-04-06 11:41:15 UTC (rev 13163)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -26,7 +26,6 @@
import org.jboss.logging.Logger;
import org.jboss.portal.common.util.ContentInfo;
import org.jboss.portal.common.util.ParameterValidation;
-import org.jboss.portal.portlet.ParametersStateString;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.invocation.PortletInvocation;
@@ -118,7 +117,7 @@
if (navigationalState != null)
{
String state = navigationalState.getStringValue();
- if (!ParametersStateString.JBPNS_PREFIX.equals(state)) // fix-me: see JBPORTAL-900
+ if (!StateString.JBPNS_PREFIX.equals(state)) // fix-me: see JBPORTAL-900
{
markupParams.setNavigationalState(state);
}
Modified: branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java 2009-04-06 11:37:18 UTC (rev 13162)
+++ branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java 2009-04-06 11:41:15 UTC (rev 13163)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2007, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -29,7 +29,6 @@
import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse;
-import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.portlet.state.AccessMode;
import org.jboss.portal.wsrp.WSRPExceptionFactory;
import org.jboss.portal.wsrp.WSRPTypeFactory;
@@ -107,7 +106,7 @@
return WSRPUtils.getAccessModeFromStateChange(stateChange);
}
- PortletInvocation initInvocation(PortletInvocationContext context)
+ PortletInvocation initInvocation(WSRPPortletInvocationContext context)
{
ActionInvocation invocation = new ActionInvocation(context);
@@ -115,14 +114,10 @@
WSRPRequestContext requestContext = WSRPRequestContext.createRequestContext(markupRequest, interactionParams);
invocation.setRequestContext(requestContext);
- // Interaction state
+ // Interaction state, navigational state is already taken care of in RequestProcessor.prepareInvocation
StateString interactionState = createNavigationalState(interactionParams.getInteractionState());
invocation.setInteractionState(interactionState);
- // Navigational state
- StateString navigationalState = createNavigationalState(getMarkupParams().getNavigationalState());
- invocation.setNavigationalState(navigationalState);
-
// Form parameters
invocation.setForm(requestContext.getForm());
Modified: branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java 2009-04-06 11:37:18 UTC (rev 13162)
+++ branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java 2009-04-06 11:41:15 UTC (rev 13163)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2007, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -24,13 +24,11 @@
package org.jboss.portal.wsrp.producer;
import org.jboss.portal.common.net.URLTools;
-import org.jboss.portal.common.util.Tools;
import org.jboss.portal.portlet.impl.jsr168.PortletUtils;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.RenderInvocation;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.portlet.state.AccessMode;
import org.jboss.portal.wsrp.WSRPConstants;
import org.jboss.portal.wsrp.WSRPRewritingConstants;
@@ -60,10 +58,11 @@
{
private static final String EMPTY = "";
private final GetMarkup getMarkup;
+ private String namespace;
public RenderRequestProcessor(WSRPProducerImpl producer, GetMarkup getMarkup) throws UnsupportedMimeTypeFault,
- UnsupportedWindowStateFault, InvalidHandleFault, UnsupportedModeFault, MissingParametersFault,
- InvalidRegistrationFault, OperationFailedFault
+ UnsupportedWindowStateFault, InvalidHandleFault, UnsupportedModeFault, MissingParametersFault,
+ InvalidRegistrationFault, OperationFailedFault
{
super(producer);
this.getMarkup = getMarkup;
@@ -105,8 +104,11 @@
return AccessMode.READ_ONLY;
}
- PortletInvocation initInvocation(PortletInvocationContext context)
+ PortletInvocation initInvocation(WSRPPortletInvocationContext context)
{
+ // MUST match namespace generation used in PortletResponseImpl.getNamespace in portlet module...
+ namespace = PortletUtils.generateNamespaceFrom(context.getWindowContext().getId());
+
return new RenderInvocation(context);
}
@@ -168,11 +170,7 @@
*/
private String processFragmentString(String renderString)
{
- String result = Tools.replaceAllInstancesOfBoundedString(
- renderString,
- PortletUtils.PREFIX,
- PortletUtils.SUFFIX,
- WSRPRewritingConstants.WSRP_REWRITE_TOKEN);
+ String result = renderString.replaceAll(namespace, WSRPRewritingConstants.WSRP_REWRITE_TOKEN);
result = URLTools.replaceURLsBy(result, new AbsoluteURLReplacementGenerator(ServletAccess.getRequest()));
return result;
Modified: branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2009-04-06 11:37:18 UTC (rev 13162)
+++ branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2009-04-06 11:41:15 UTC (rev 13163)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2007, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -28,14 +28,12 @@
import org.jboss.portal.common.net.media.MediaType;
import org.jboss.portal.common.util.MarkupInfo;
import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.portlet.OpaqueStateString;
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.spi.PortalContext;
-import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.portlet.spi.SecurityContext;
import org.jboss.portal.portlet.spi.UserContext;
import org.jboss.portal.portlet.spi.WindowContext;
@@ -175,7 +173,7 @@
abstract AccessMode getAccessMode();
- abstract PortletInvocation initInvocation(PortletInvocationContext context);
+ abstract PortletInvocation initInvocation(WSRPPortletInvocationContext context);
abstract Object processResponse(PortletInvocationResponse response);
@@ -358,7 +356,7 @@
}
else
{
- return new OpaqueStateString(navigationalState);
+ return StateString.create(navigationalState);
}
}
Modified: branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPPortletInvocationContext.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPPortletInvocationContext.java 2009-04-06 11:37:18 UTC (rev 13162)
+++ branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPPortletInvocationContext.java 2009-04-06 11:41:15 UTC (rev 13163)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.wsrp.producer;
import org.jboss.portal.common.NotYetImplemented;
@@ -159,4 +160,9 @@
invocation.setPortalContext(portalContext);
invocation.setUserContext(userContext);
}
+
+ WindowContext getWindowContext()
+ {
+ return windowContext;
+ }
}
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r13162 - branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-06 07:37:18 -0400 (Mon, 06 Apr 2009)
New Revision: 13162
Modified:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
Log:
JBEPP-58: Default portlets store non serializable attributes in the session
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java 2009-04-06 11:19:36 UTC (rev 13161)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java 2009-04-06 11:37:18 UTC (rev 13162)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -34,6 +34,7 @@
import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
import javax.faces.model.SelectItem;
+import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -47,7 +48,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public abstract class AuthorizationBean
+public abstract class AuthorizationBean implements Serializable
{
public AbstractDynamicBean getForRole()
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-04-06 11:19:36 UTC (rev 13161)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-04-06 11:37:18 UTC (rev 13162)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.core.admin.ui;
import org.jboss.portal.Mode;
@@ -43,6 +44,7 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import javax.faces.model.SelectItem;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -433,8 +435,9 @@
}
};
- public class InstanceAuthorizationBean extends AuthorizationBean
+ public class InstanceAuthorizationBean extends AuthorizationBean implements Serializable
{
+ private static final long serialVersionUID = -6284936544525435559L;
public DomainConfigurator getDomainConfigurator()
{
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-04-06 11:19:36 UTC (rev 13161)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-04-06 11:37:18 UTC (rev 13162)
@@ -88,28 +88,28 @@
// Wired services
/** . */
- private PortalObjectContainer portalObjectContainer;
+ private transient PortalObjectContainer portalObjectContainer;
/** . */
- private CoordinationConfigurator coordinationService;
+ private transient CoordinationConfigurator coordinationService;
/** . */
- private InstanceContainer instanceContainer;
+ private transient InstanceContainer instanceContainer;
/** . */
- private LayoutService layoutService;
+ private transient LayoutService layoutService;
/** . */
- private ThemeService themeService;
+ private transient ThemeService themeService;
/** . */
- private DomainConfigurator domainConfigurator;
+ private transient DomainConfigurator domainConfigurator;
/** . */
- private RoleModule roleModule;
+ private transient RoleModule roleModule;
/** Listener registry to bind even listener to PortalNodes. */
- private PortalEventListenerRegistry listenerRegistry;
+ private transient PortalEventListenerRegistry listenerRegistry;
// Navigational state
@@ -733,8 +733,9 @@
getDomainConfigurator().setSecurityBindings(page.getId().toString(PortalObjectPath.CANONICAL_FORMAT), constraints);
}
- public class PortalObjectAuthorizationBean extends AuthorizationBean
+ public class PortalObjectAuthorizationBean extends AuthorizationBean implements Serializable
{
+ private static final long serialVersionUID = 7281763204029034269L;
public DomainConfigurator getDomainConfigurator()
{
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r13161 - in branches/Enterprise_Portal_Platform_4_3: wsrp/src/main/org/jboss/portal/test/wsrp/other and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-06 07:19:36 -0400 (Mon, 06 Apr 2009)
New Revision: 13161
Modified:
branches/Enterprise_Portal_Platform_4_3/core-wsrp/build.xml
branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/test/wsrp/other/WSRPPortletURLTestCase.java
branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java
branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java
Log:
JBEPP-57: Ampersand sign (&) may be double encoded when going through WSRP
Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/build.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-wsrp/build.xml 2009-04-06 10:58:26 UTC (rev 13160)
+++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/build.xml 2009-04-06 11:19:36 UTC (rev 13161)
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
@@ -152,10 +152,10 @@
<pathelement location="${project.tools}/lib/explode.jar"/>
<path refid="apache.ant.classpath"/>
</path>
- <taskdef
- name="explode"
- classname="org.jboss.portal.common.ant.Explode"
- classpathref="explode.task.classpath"/>
+ <taskdef
+ name="explode"
+ classname="org.jboss.portal.common.ant.Explode"
+ classpathref="explode.task.classpath"/>
</target>
<!--+====================================================================+-->
@@ -209,11 +209,9 @@
<fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/>
<fileset dir="${build.lib}" includes="portal-wsrp-admin-lib.jar"/>
<fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
- <!--<fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>-->
<fileset dir="${apache.lang.lib}" includes="commons-lang.jar"/>
<fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/>
<fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/>
- <!--<fileset dir="${commons.el.lib}" includes="commons-el.jar"/>-->
</copy>
<copy todir="${build.wsrp-admin.war}/WEB-INF/lib">
@@ -225,9 +223,9 @@
<fileset dir="${build.resources}/portal-wsrp-admin-war" includes="**/*"/>
</copy>
- <copy todir="${build.resources}/portal-wsrp-admin.war">
- <fileset dir="${source.bin}/portal-wsrp-admin-war" includes="**/*"/>
- </copy>
+ <copy todir="${build.resources}/portal-wsrp-admin.war">
+ <fileset dir="${source.bin}/portal-wsrp-admin-war" includes="**/*"/>
+ </copy>
<jar jarfile="${build.lib}/portal-wsrp-admin.war">
<fileset dir="${build.resources}/portal-wsrp-admin.war" includes="**/*"/>
@@ -240,7 +238,7 @@
dir="${build.resources}/portal-wsrp-admin-sar"
tofile="${build.lib}/portal-wsrp-admin.sar"/-->
- </target>
+ </target>
<!-- ================================================================== -->
<!-- Cleaning -->
@@ -291,9 +289,9 @@
<target name="package-other-test" description="Generates the other test artifacts" depends="compile">
<mkdir dir="${build.lib.test}"/>
<jar jarfile="${build.lib.test}/test-other-lib.jar">
- <fileset dir="${build.classes}/">
- <include name="org/jboss/portal/test/wsrp/other/*.class"/>
- </fileset>
+ <fileset dir="${build.classes}/">
+ <include name="org/jboss/portal/test/wsrp/other/*.class"/>
+ </fileset>
</jar>
</target>
Modified: branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/test/wsrp/other/WSRPPortletURLTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/test/wsrp/other/WSRPPortletURLTestCase.java 2009-04-06 10:58:26 UTC (rev 13160)
+++ branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/test/wsrp/other/WSRPPortletURLTestCase.java 2009-04-06 11:19:36 UTC (rev 13161)
@@ -101,11 +101,15 @@
public void testDoublyEncodedAmpersand()
{
String expected = "wsrp_rewrite?wsrp-urlType=render&amp;wsrp-mode=wsrp:help&amp;wsrp-windowState=wsrp:maximized/wsrp_rewrite";
- WSRPPortletURL url = WSRPPortletURL.create(expected);
-
- assertTrue(url instanceof WSRPRenderURL);
- assertEquals(Mode.HELP, url.getMode());
- assertEquals(WindowState.MAXIMIZED, url.getWindowState());
+ try
+ {
+ WSRPPortletURL.create(expected);
+ fail("Should have thrown an exception on doubly encoded &!");
+ }
+ catch (Exception e)
+ {
+ // expected
+ }
}
/** Relax validation and test that we now accept normally invalid URLs. */
Modified: branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java 2009-04-06 10:58:26 UTC (rev 13160)
+++ branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java 2009-04-06 11:19:36 UTC (rev 13161)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -61,7 +61,7 @@
private static final String DEFAULT_MARKUP_PORTLET_WAR = "test-markup-portlet.war";
public MarkupTestCase()
- throws Exception
+ throws Exception
{
super("MarkupTestCase", DEFAULT_MARKUP_PORTLET_WAR);
}
@@ -115,9 +115,9 @@
MarkupResponse response = markupService.getMarkup(getMarkup);
- checkMarkupResponse(response, "<form method='post' action='wsrp_rewrite?wsrp-urlType=blockingAction&wsrp" +
- "-interactionState=JBPNS_/wsrp_rewrite' id='wsrp_rewrite_portfolioManager'><table><tr><td>Stock symbol</t" +
- "d><td><input name='symbol'/></td></tr><tr><td><input type='submit' value='Submit'></td></tr></table></form>");
+ checkMarkupResponse(response, "<form method='post' action='wsrp_rewrite?wsrp-urlType=blockingAction&wsrp" +
+ "-interactionState=JBPNS_/wsrp_rewrite' id='wsrp_rewrite_portfolioManager'><table><tr><td>Stock symbol</t" +
+ "d><td><input name='symbol'/></td></tr><tr><td><input type='submit' value='Submit'></td></tr></table></form>");
}
public void testGetMarkupRenderParameters() throws Exception
@@ -155,7 +155,7 @@
// let's see now if we can increment the counter
PerformBlockingInteraction performBlockingInteraction =
- WSRPTypeFactory.createDefaultPerformBlockingInteraction(getHandleForCurrentlyDeployedArchive());
+ WSRPTypeFactory.createDefaultPerformBlockingInteraction(getHandleForCurrentlyDeployedArchive());
InteractionParams interactionParams = performBlockingInteraction.getInteractionParams();
interactionParams.setInteractionState(incrementAction.getInteractionState().getStringValue());
markupService.performBlockingInteraction(performBlockingInteraction);
@@ -223,7 +223,7 @@
public void testPerformBlockingInteractionRedirect() throws Exception
{
PerformBlockingInteraction performBlockingInteraction =
- WSRPTypeFactory.createDefaultPerformBlockingInteraction(getDefaultHandle());
+ WSRPTypeFactory.createDefaultPerformBlockingInteraction(getDefaultHandle());
InteractionParams interactionParams = performBlockingInteraction.getInteractionParams();
NamedString[] formParams = {new NamedString("symbol", "HELP")}; // crappy way but this is a test! ;)
interactionParams.setFormParameters(formParams);
@@ -436,8 +436,8 @@
GetMarkup getMarkup = createMarkupRequestForCurrentlyDeployedPortlet();
MarkupResponse response = markupService.getMarkup(getMarkup);
- checkMarkupResponse(response, "wsrp_rewrite?wsrp-urlType=blockingAction&wsrp-interactionState=JBPNS_/wsrp_rewrite\n" +
- "wsrp_rewrite?wsrp-urlType=render&wsrp-navigationalState=JBPNS_/wsrp_rewrite");
+ checkMarkupResponse(response, "wsrp_rewrite?wsrp-urlType=blockingAction&wsrp-interactionState=JBPNS_/wsrp_rewrite\n" +
+ "wsrp_rewrite?wsrp-urlType=render&wsrp-navigationalState=JBPNS_/wsrp_rewrite");
}
finally
{
@@ -474,7 +474,7 @@
try
{
PerformBlockingInteraction action =
- WSRPTypeFactory.createDefaultPerformBlockingInteraction(getHandleForCurrentlyDeployedArchive());
+ WSRPTypeFactory.createDefaultPerformBlockingInteraction(getHandleForCurrentlyDeployedArchive());
action.getInteractionParams().setFormParameters(new NamedString[]{new NamedString("multi", "value1")});
BlockingInteractionResponse actionResponse = markupService.performBlockingInteraction(action);
GetMarkup markupRequest = createMarkupRequestForCurrentlyDeployedPortlet();
@@ -483,7 +483,7 @@
checkMarkupResponse(response, "multi: value1");
action.getInteractionParams().setFormParameters(new NamedString[]{
- new NamedString("multi", "value1"), new NamedString("multi", "value2")});
+ new NamedString("multi", "value1"), new NamedString("multi", "value2")});
actionResponse = markupService.performBlockingInteraction(action);
markupRequest = createMarkupRequestForCurrentlyDeployedPortlet();
markupRequest.getMarkupParams().setNavigationalState(actionResponse.getUpdateResponse().getNavigationalState());
@@ -685,7 +685,7 @@
private String checkPBIAndGetNavigationalState(String symbol) throws Exception
{
PerformBlockingInteraction performBlockingInteraction =
- WSRPTypeFactory.createDefaultPerformBlockingInteraction(getDefaultHandle());
+ WSRPTypeFactory.createDefaultPerformBlockingInteraction(getDefaultHandle());
InteractionParams interactionParams = performBlockingInteraction.getInteractionParams();
NamedString[] formParams = {new NamedString("symbol", symbol)};
interactionParams.setFormParameters(formParams);
@@ -722,7 +722,7 @@
ExtendedAssert.assertNotNull(markupContext);
String markupString = markupContext.getMarkupString();
ExtendedAssert.assertString1ContainsString2(markupString, "count = " + count);
- ExtendedAssert.assertString1ContainsString2(markupString, "<a href='wsrp_rewrite?wsrp-urlType=render&wsrp-navigationalState=JBPNS_/wsrp_rewrite'>render</a>");
+ ExtendedAssert.assertString1ContainsString2(markupString, "<a href='wsrp_rewrite?wsrp-urlType=render&wsrp-navigationalState=JBPNS_/wsrp_rewrite'>render</a>");
// checking session
checkSessionForCurrentlyDeployedPortlet(response);
Modified: branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java 2009-04-06 10:58:26 UTC (rev 13160)
+++ branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java 2009-04-06 11:19:36 UTC (rev 13161)
@@ -51,20 +51,23 @@
private static final Logger log = Logger.getLogger(WSRPPortletURL.class);
private static final String EQUALS = "=";
- private static final String AMPERSAND = "&";
+
+ private static final String ENCODED_AMPERSAND = "&";
+ private static final String AMPERSAND = "&";
+ private static final String AMP_AMP = "&amp;";
+
private static final String PARAM_SEPARATOR = "|";
private static final int URL_TYPE_END = WSRPRewritingConstants.URL_TYPE_NAME.length() + EQUALS.length();
+ private boolean secure;
- private boolean secure;
private Mode mode;
+
private WindowState windowState;
/** Are we using strict rewriting parameters validation mode? */
private static boolean strict = true;
-
/** Holds extra parameters if we are in relaxed validation mode */
private Map<String, String> extraParams;
-
/** Remember position of extra parameters wrt end token */
private boolean extraParamsAfterEndToken = false;
@@ -173,9 +176,12 @@
}
// standardize parameter separators
- encodedURL = Tools.replace(encodedURL, "&amp;", PARAM_SEPARATOR); // sanitize doubly encoded & fix-me: should be removed?
+ if (encodedURL.contains(AMP_AMP))
+ {
+ throw new IllegalArgumentException(encodedURL + " contains a doubly encoded &!");
+ }
+ encodedURL = Tools.replace(encodedURL, ENCODED_AMPERSAND, PARAM_SEPARATOR);
encodedURL = Tools.replace(encodedURL, AMPERSAND, PARAM_SEPARATOR);
- encodedURL = Tools.replace(encodedURL, "&", PARAM_SEPARATOR); // this second shouldn't be used but in case it is...
// remove url type param name and extract value
encodedURL = encodedURL.substring(URL_TYPE_END);
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r13160 - in branches/Enterprise_Portal_Platform_4_3: core-admin/src/resources/portal-admin-war/WEB-INF/classes and 5 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-06 06:58:26 -0400 (Mon, 06 Apr 2009)
New Revision: 13160
Added:
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_it.properties
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties
Modified:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
Log:
JBEPP-55: Italian translation update
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2009-04-06 10:50:34 UTC (rev 13159)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2009-04-06 10:58:26 UTC (rev 13160)
@@ -34,4 +34,4 @@
PORTAL=Portale
ADMIN=Amministrazione
MEMBERS=Membri
-LOGGED=Connesso come
\ No newline at end of file
+LOGGED=Connesso come
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2009-04-06 10:50:34 UTC (rev 13159)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2009-04-06 10:58:26 UTC (rev 13160)
@@ -104,6 +104,7 @@
COMMON_DEFINE_NAME_WINDOW=Dai un nome alla finestra dei contenuti (opzionale)
COMMON_WINDOW_NAME=Nome Finestra
COMMON_SELECT_TYPE_CONTENT=Seleziona il tipo di contenuto che sar\u00e0 aggiunto alla pagina
+COMMON_NO_SELECTED_CONTENT=Devi selezionare un tipo di contenuto!
COMMON_CONTENT_TYPE=Tipo del Contenuto
COMMON_SELECT_CONTENT=Seleziona il contenuto che sar\u00e0 aggiunto alla pagina
COMMON_PAGE_LAYOUT=Layout della Pagina
@@ -266,4 +267,74 @@
CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME=In caso di errore redireziona sulla risorsa
CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION=In caso di errore redireziona sulla risorsa
-NO_BOUND_LISTENER=nessun listener
\ No newline at end of file
+NO_BOUND_LISTENER=nessun listener
+
+COORDINATION_COORDINATION=Coordinazione
+COORDINATION_PARAMETER_BINDINGS=Collegamenti ai parametri
+COORDINATION_PARAMETER_EXPLICIT_MODE=Usa un esplicito collegamento al parametro
+COORDINATION_PARAMETER_MANAGE_EXISTING=Gestisci i collegamenti ai parametri esistenti:
+COORDINATION_PARAMETER_EXISTING_NONE=Nessun collegamento esplicito ai parametri.
+COORDINATION_PARAMETER_EXISTING_NAME=Nome
+COORDINATION_PARAMETER_EXISTING_PAIRS=Finestra / coppia di parametri
+COORDINATION_PARAMETER_EXISTING_ACTIONS=Azioni
+COORDINATION_PARAMETER_CREATE=Crea un nuovo collegamento al parametro:
+COORDINATION_PARAMETER_CREATE_NO_PAIRS=Non ci sono parametri pubblici disponibili. Non posso creare il collegamento al parametro.
+COORDINATION_PARAMETER_CREATE_STEP1=1. Seleziona il parametro pubblico / coppia di finestre:
+COORDINATION_PARAMETER_CREATE_STEP2=2. Assegna un nome al collegamento al parametro:
+COORDINATION_PARAMETER_CREATE_CREATE=Crea il collegamento
+
+COORDINATION_WINDOWS=Finestre
+
+COORDINATION_ALIAS_BINDINGS=Gestione degli alias
+COORDINATION_ALIAS_MANAGE_EXISTING=Gestisci gli alias esistenti:
+COORDINATION_ALIAS_EXISTING_NONE=Nessun alias esistente.
+COORDINATION_ALIAS_EXISTING_NAME=Nome
+COORDINATION_ALIAS_EXISTING_ORIGINAL=QName originale
+COORDINATION_ALIAS_EXISTING_ACTIONS=Azioni
+COORDINATION_ALIAS_CREATE=Crea un nuovo alias:
+COORDINATION_ALIAS_CREATE_NO_PARAMS=on ci sono parametri pubblici disponibili. Non posso creare l\'alias.
+COORDINATION_ALIAS_CREATE_STEP1=1. Seleziona il parametro pubblico:
+COORDINATION_ALIAS_CREATE_STEP2=2. Assegna un nome all'alias:
+COORDINATION_ALIAS_CREATE_CREATE=Crea l\'alias
+
+COORDINATION_EVENT_WIRINGS=Gestori di eventi
+COORDINATION_EVENT_EXPLICIT_MODE=Usa la gestione esplicita degli eventi
+COORDINATION_EVENT_MANAGE_EXISTING=Gestisci i gestori di eventi esistenti:
+COORDINATION_EVENT_EXISTING_NONE=Nessun gestore di eventi esistente.
+COORDINATION_EVENT_EXISTING_NAME=Nome
+COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS=Sorgente delle finestre
+COORDINATION_EVENT_EXISTING_SOURCE_EVENTS=Sorgente degli eventi
+COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS=Destinazione degli eventi
+COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS=Destinazione delle finestre
+COORDINATION_EVENT_EXISTING_ACTIONS=Azioni
+COORDINATION_EVENT_CREATE=Crea un nuovo gestore di eventi:
+COORDINATION_EVENT_CREATE_NO_EVENTS=Non ci sono eventi disponibili. Non posso creare il gestore di eventi.
+COORDINATION_EVENT_CREATE_STEP1=1. Seleziona l'evento sorgente:
+COORDINATION_EVENT_CREATE_STEP2=2. Seleziona la finestra sorgente che produce l\'evento:
+COORDINATION_EVENT_CREATE_STEP3=3. Seleziona la destinazione dell\'evento:
+COORDINATION_EVENT_CREATE_STEP4=4. Seleziona la finestra destinataria che produce l\'evento:
+COORDINATION_EVENT_CREATE_STEP5=5. Assegna un nome al gestore:
+COORDINATION_EVENT_CREATE_CREATE=Crea il gestore
+COORDINATION_EVENT_CREATE_PREVIEW=Anteprima del nuovo gestore di eventi:
+COORDINATION_EVENT_CREATE_PREVIEW_STEP1=Hai selezionato il seguente sorgente dell\'evento:
+COORDINATION_EVENT_CREATE_PREVIEW_STEP2=lanciato dalla seguente finestra sorgente:
+COORDINATION_EVENT_CREATE_PREVIEW_STEP3=Gli eventi prodotti dalla finestra saranno eseguiti nella seguente destinazione dell\'evento:
+COORDINATION_EVENT_CREATE_PREVIEW_STEP4=per le seguenti finestre destinatarie:
+
+COORDINATION_WIRING=gestione dell'evento
+COORDINATION_PARAMETER=collegamento al parametro
+COORDINATION_ALIAS=collegamento all'alias
+
+INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido per {1}: Non pu\u00f2 essere null, vuoto o contenere '\\' o '%5c'
+NO_SELECTED_PORTLET_ERROR=Non \u00e8 stata selezionata nessuna portlet!
+DUPLICATE_ERROR=Esiste gi\u00e0 un {1} chiamato ''{0}''!
+bean_support_unexpected_error=Errore inatteso:
+bean_support_cause=Causa:
+
+INSTANCE_TYPE=Istanza
+PAGE_TYPE=pagina
+PORTAL_TYPE=portale
+DISPLAY_NAME_TYPE=nome visualizzato
+PROPERTY_TYPE=propriet\u00e0
+PORTAL_OBJECT_TYPE=oggetto del portale
+WINDOW_TYPE=finestra
Modified: branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2009-04-06 10:50:34 UTC (rev 13159)
+++ branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2009-04-06 10:58:26 UTC (rev 13160)
@@ -97,7 +97,7 @@
CMS_APPROVAL=Oggetti in sospeso
CMS_PATH=Localit\u00e0
-CMS_EMPTY_FOLDER=Questa cartella \u00e8 vuota .
+CMS_EMPTY_FOLDER=Questa cartella \u00e8 vuota.
CMS_ERROR_UPLOADARCHIVE_ASYNC=Si \u00e8 verificato un errore nel processare l\'archivio. Riprova attivando il servizio di processione asincrona
CMS_MSG_UPLOADARCHIVE_ASYNC=Il tuo archivio sta per essere processato. Una volta terminato il processo le risorse appariranno nella tua cartella
@@ -105,6 +105,7 @@
CMS_REQUIRED=Obbligatorio
CMS_LINK_TO_RESOURCES=I link alle risorse all\'interno del portale devono essere assoluti. Per esempio: Un link a un\'immagine che si trova in in default/images/back.gif deve essere digitato esattamente come mostrato. Non iniziare mai il percorso con uno (/). Puoi verificare la correttezza del link cliccando sul bottone di anteprima dell1'editor
CMS_ERROR_PROCESSING=ERRORE nel processare l\'esportazione
+CMS_ERROR_EXPORT=E\' avvenuto un errore durante l\'operazione di esportazione. Assicurati che la directory che si sta esportando non sia vuota
CMS_YOUR_EXPORT_0=L\'esportazione di
CMS_YOUR_EXPORT_1=\u00e8 pronta per il Download
CMS_CLICK_TO_DOWNLOAD=Clicca per il Download
@@ -146,4 +147,9 @@
CMS_MSG_DESTINATION_ALREADY_EXISTS=Il comando non pu\u00F2 essere eseguito, perch\u00e8 la destinazione esiste gi\u00e0.
CMS_CANT_MOVE_SAME_DESTINATION=Non puoi spostare la cartella nella stessa destinazione
-CMS_DATE_PATTERN=MM/dd/yy HH:mm
\ No newline at end of file
+CMS_DATE_PATTERN=MM/dd/yy HH:mm
+
+INVALID_ARCHIVE_MESSAGE=L\'archivio che si sta aggiornando non \u00e8 un file valido
+CMS_MISSING_RESOURCE=La risorsa CMS richiesta non pu\u00F2 essere trovata
+
+
Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-04-06 10:50:34 UTC (rev 13159)
+++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-04-06 10:58:26 UTC (rev 13160)
@@ -21,6 +21,8 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
+javax.faces.validator.LengthValidator.MINIMUM= Il valore troppo \u00e8 corto ({0} caratteri minimo).
+
IDENTITY_APPLICATION_NOT_AVAILABLE=La portlet non \u00e8 disponibile. Verifica la configurazione e il log degli errori per i dettagli.
IDENTITY_WELCOME=Benvenuto
@@ -38,8 +40,7 @@
IDENTITY_REGISTER_STATUS_TITLE=Stato della registrazione
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_REGISTER_REQUIRED_INFORMATION=indica un campo richiesto.
IDENTITY_LOST_PASSWORD_TITLE=Dimenticati i dati del tuo login?
IDENTITY_LOST_PASSWORD_DESCRIPTION=Inserisci il tuo nome utente per azzerare la password.
@@ -48,8 +49,6 @@
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
@@ -119,7 +118,9 @@
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 attivato
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.
@@ -168,8 +169,10 @@
IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Il tuo account \u00e8 stato attivato. Puoi ora loggarti.
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_TAKEN=Il nome utente esiste gi\u00e0.
IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Errore durante la validazione del nome utente.
+IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=Il nome del ruolo esiste gi\u00e0.
+IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=Errore durante la 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.
@@ -178,4 +181,9 @@
# Example usage for dynamic values
IDENTITY_DYNAMIC_VALUE_TEST=titolo di test
-IDENTITY_DYNAMIC_VALUE_TEST2=titolo di test2
\ No newline at end of file
+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
Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl 2009-04-06 10:50:34 UTC (rev 13159)
+++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl 2009-04-06 10:58:26 UTC (rev 13160)
@@ -6,7 +6,7 @@
Username: ${username}
Password: ${password}
-L'account non è ancora abilitato. Hai bisogno di accedere a questo url per abilitare l'account.
+L'account non � ancora abilitato. Hai bisogno di accedere a questo url per abilitare l'account.
${activationLink}
Se non hai richiesto alcuna creazione, puoi ignorare il messaggio.
Copied: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_it.properties (from rev 13089, branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_it.properties)
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_it.properties (rev 0)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_it.properties 2009-04-06 10:58:26 UTC (rev 13160)
@@ -0,0 +1,2 @@
+javax.portlet.title=Saluti !
+javax.portlet.keywords=esempio,prova
\ No newline at end of file
Copied: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties (from rev 13089, branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties)
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties (rev 0)
+++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties 2009-04-06 10:58:26 UTC (rev 13160)
@@ -0,0 +1,182 @@
+################################################################################
+# JBoss, a division of Red Hat #
+# Copyright 2009, Red Hat Middleware, LLC, and individual #
+# contributors as indicated by the @authors tag. See the #
+# copyright.txt in the distribution for a full listing of #
+# individual contributors. #
+# #
+# This is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU Lesser General Public License as #
+# published by the Free Software Foundation; either version 2.1 of #
+# the License, or (at your option) any later version. #
+# #
+# This software is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
+# Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public #
+# License along with this software; if not, write to the Free #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
+################################################################################
+
+## WSRP GUI localization
+
+# JBoss Portal display information
+org.jboss.portal.object.name.WSRPConfigurationPortlet = Configurazione WSRP
+org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet di configurazione WSRP
+
+# Tabs
+nav_tabs_consumers = Configurazione dei Consumer
+nav_tabs_producer_config = Configurazione del Producer
+nav_tabs_producer_management = Gestione del Producer
+
+# Object path in consumer template
+path_consumers_root = Consumer
+path_consumers_consumer = Configurazione del Consumer ''{0}''
+path_consumers_active = attivo
+path_consumers_inactive = inattivo
+path_consumers_refreshNeeded = (\u00e8 necessario il refresh)
+
+# Confirm deletion of a consumer screen
+confirm_delete_consumer_title = Elimino il consumer ''{0}''?
+confirm_delete_consumer_message = Stai per eliminare il consumer ''{0}''!
+confirm_detete_consumer_proceed = Sicuro di voler continuare?
+confirm_delete_consumer_submit = Elimina il consumer
+confirm_delete_consumer_cancel = Annulla
+
+# Confirm deletion of local registration information screen
+confirm_delete_registration_title = Elimino la registrazione locale per il consumer ''{0}''?
+confirm_delete_registration_message = Stai per eliminare le informazioni della registrazione locale del consumer ''{0}''! \n\
+E' necessario soltanto se il consumer si \u00e8 prima registrato con il producer remoto e il producer \u00e8 \n\
+stato configurato in modo da non richiedere pi\u00f9 la registrazione. \n\
+Elimina le informazioni della registrazione locale soltanto se riscontri degli errori per \n\
+questa particolare situazione. Se si cancella la registrazione in alcune situazioni c'� il rischio di non poter pi\u00f9 lavorare \n\
+con quel producer.
+confirm_delete_registration_proceed = Sicuro di voler procedere?
+confirm_delete_registration_submit = Elimina la registrazione locale
+confirm_delete_registration_cancel = Annulla
+
+# Consumers screen
+consumers_title = Gestione dei Consumer
+consumers_create_title = Crea un Consumer chiamato:
+consumers_create_submit = Crea un Consumer
+
+# Consumers list
+consumers_table_column_consumer = Consumer
+consumers_table_column_consumer_status = stato:
+consumers_table_column_actions = Azioni
+consumers_table_action_configure = Configura
+consumers_table_action_refresh = Aggiorna
+consumers_table_action_activate = Attiva
+consumers_table_action_deactivate = Disattiva
+consumers_table_action_register = Registra
+consumers_table_action_deregister = Togli dalla registrazione
+consumers_table_action_delete = Elimina
+consumers_table_reload = Ricarica i consumer
+
+# Consumer editing screen
+edit_consumer_producer = Id del Producer:
+edit_consumer_cache = Scadenza della cache:
+edit_consumer_cache_seconds = (secondi prima della scadenza)
+edit_consumer_endpoint = Configurazione dell\'Endpoint:
+edit_consumer_endpoint_wsdl = Uso il WSDL?
+edit_consumer_endpoint_sd = Service Description URL:
+edit_consumer_endpoint_m = Markup URL:
+edit_consumer_endpoint_r = Registration URL:
+edit_consumer_endpoint_pm = Portlet Management URL:
+edit_consumer_registration = Informazioni sulla registratione:
+edit_consumer_registration_current = Informazioni sulla registratione corrente:
+edit_consumer_prop_name = Nome
+edit_consumer_prop_desc = Descrizione
+edit_consumer_prop_value = Valore
+edit_consumer_registration_update_props = Propriet\u00e0 dell\'update
+edit_consumer_registration_no_props = E' richiesta una registrazione senza le propriet\u00e0 di registrazione.
+edit_consumer_registration_modify = Modifica la registrazione
+edit_consumer_registration_modify_title = Modifica la registrazione secondo questo producer
+edit_consumer_registration_expected = Informazioni richieste dalla registrazione:
+edit_consumer_no_registration = Il Producer non richiede la registrazione.
+edit_consumer_registration_context = Contesto della registrazione:
+edit_consumer_registration_context_handle = Gestore:
+edit_consumer_registration_context_erase = Elimina la registrazione locale
+edit_consumer_registration_context_erase_title = Elimina l\'informazione della registrazione locale (potenzialmente pericoloso!)
+edit_consumer_refresh = Aggiorna e salva
+edit_consumer_refresh_title = Salva le modifiche e aggiorna le informazioni del producer
+edit_consumer_cancel = Cancel
+
+# Confirm registration property deletion screen
+confirm_delete_reg_property_title = Elimino ''{0}'' descrizioni sulla propriet\u00e0 di registrazione?
+confirm_delete_reg_property_message = Stai per cancellare ''{0}'' descrizioni sulla propriet\u00e0 di registrazione! \n\
+Render\u00e0 non valide le registrazioni del consumer che dovr\u00e0 modificare la propria informazione \n\
+sulla registrazione.
+confirm_delete_reg_property_proceed = Sicuro di voler procedere?
+confirm_delete_reg_property_submit = Elimina la propriet\u00e0
+confirm_delete_reg_property_cancel = Annulla
+
+# Producer configuration screen
+producer_config_title = Configurazione del Producer
+producer_config_sd_requires_reg = L'accesso all\'intera descrizione del servizio richiede la registrazione da parte dei consumer.
+producer_config_strict = Usa per intero le propriet\u00e0 WSRP.
+producer_config_requires_reg = E\' richiesta la registrazione. La modifica di quest\'informazione render\u00e0 non valide le registrazioni del consumer.
+producer_config_reg_policy = Nome della classe della policy di registrazione:
+producer_config_reg_prop_validator = Nome della classe del validatore delle propriet\u00e0 di registrazione:
+producer_config_reg_props = Propriet\u00e0 della registratione
+producer_config_reg_prop_name = Nome
+producer_config_reg_prop_type = Tipo
+producer_config_reg_prop_label = Titolo
+producer_config_reg_prop_hint = Hint
+producer_config_reg_prop_action = Azione
+producer_config_reg_prop_remove = Elimina
+producer_config_no_reg_props = Non \u00e8 richiesta alcuna propriet\u00e0 di registrazione.
+producer_config_add_reg_prop = Aggiungi propriet\u00e0
+producer_config_save = Salva
+producer_config_cancel = Annulla
+
+## Localized messages in JSF beans
+
+bean_support_unexpected_error = Si \u00e8 verificato un errore inaspettato:
+bean_support_cause = Causa:
+CONSUMER_TYPE = Consumer
+
+# ConsumerBean
+bean_consumer_cannot_find_consumer = Non posso trovare il consumer ''{0}''!
+bean_consumer_cannot_update_consumer = Non posso aggiornare il consumer!
+bean_consumer_cannot_refresh_consumer = Non posso eseguire il refresh del consumer!
+bean_consumer_modify_reg_success = Registrazione modificata con successo!
+bean_consumer_invalid_modify = Tentativo non valido di modifica di una registrazione modificata localmente!
+bean_consumer_cannot_modify_reg = Non posso modificare la registrazione!
+bean_consumer_cannot_erase_reg = Non posso eliminare la registrazione locale!
+bean_consumer_malformed_url = ''{0}'' non \u00e8 un URL valido: {1}
+bean_consumer_update_success = Consumer aggiornato con successo!
+
+# ConsumerManagerBean
+bean_consumermanager_invalid_new_consumer_name = E\' necessario un nome di campo non null o non vuoto per il nuovo consumer!
+bean_consumermanager_no_consumer = Non \u00e8 stato selezionato nessun consuer!
+bean_consumermanager_refresh_bypassed = Non \u00e8 necessario alcun aggiornamento.
+bean_consumermanager_refresh_success = Aggiornamento eseguito con successo.
+bean_consumermanager_refresh_failure = Aggiornamento fallito (probabilmente perch\u00e8 le informazioni di registrazione non sono valide).
+bean_consumermanager_refresh_exception = Si \u00e8 verificato un errore inaspettato.
+bean_consumermanager_refresh_modify = Le informazioni locali e remote sono cambiate, dovresti modificare la registrazione al producer remoto.\n\
+Le nuove informazioni locali saranno salvate ma i dati della registrazione corrente non saranno usati finch\u00e8 non modifichi \
+con successo la registrazione al producer.
+
+# ProducerBean
+bean_producer_regpolicy_unset = RegistrationPolicy non inserita
+bean_producer_cannot_save = Non posso salvare la configurazione del producer. Causa: {0}
+bean_producer_cannot_reload = Non posso ricaricare la configurazione del producer. Causa: {0}
+bean_producer_save_success = La configurazione del producer \u00e8 stata salvata con successo!
+bean_producer_cancel_success = Tutte le modifiche fatte al producer sono state annullate!
+
+## RegistrationProperty Status localization
+registration_property_status_inexistent = Non esiste nel producer
+registration_property_status_missing = Mancante
+registration_property_status_missing_value = Valore mancante
+registration_property_status_unchecked_value = Stato non determinto
+registration_property_status_invalid_value = Valore non valido
+registration_property_status_valid = Valido
+
+org.jboss.portal.object.name.admin.WSRP=WSRP
+
+INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido di {1} : Non \u00f2 essere null, vuoto o contenere '\\' o '%5c'
+DUPLICATE_ERROR=Un valore {1} con nome ''{0}'' esiste gi\u00e0!
\ No newline at end of file
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r13159 - in branches/Enterprise_Portal_Platform_4_3: core/src/resources/portal-core-war/WEB-INF and 22 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-06 06:50:34 -0400 (Mon, 06 Apr 2009)
New Revision: 13159
Added:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/bin/portal-admin-war/img/locales/br.gif
branches/Enterprise_Portal_Platform_4_3/core-admin/src/bin/portal-admin-war/img/locales/pt_BR.gif
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_pt.jsp
Removed:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/bin/portal-admin-war/img/locales/br.gif
Modified:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties
branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml
branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties
branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_pt_BR.properties
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_pt_BR.properties
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/default-object.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml
branches/Enterprise_Portal_Platform_4_3/core-search/src/resources/portal-search-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-search/src/resources/portal-search-war/WEB-INF/portlet.xml
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/data/default-object.xml
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/core/src/resources/test/deployment/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet-instances.xml
branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-war/WEB-INF/portlet-instances.xml
Log:
JBEPP-50: Adding support for brazilian portuguese
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/data/default-object.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/data/default-object.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/conf/data/default-object.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -149,6 +149,7 @@
<display-name xml:lang="es">Home</display-name>
<display-name xml:lang="fr">Accueil</display-name>
<display-name xml:lang="ru">Домой</display-name>
+ <display-name xml:lang="pt_BR">Início</display-name>
<properties>
<property>
<name>order</name>
@@ -305,6 +306,7 @@
<display-name xml:lang="es">Home</display-name>
<display-name xml:lang="fr">Accueil</display-name>
<display-name xml:lang="ru">Домой</display-name>
+ <display-name xml:lang="pt_BR">Início</display-name>
<properties>
<property>
<name>order</name>
@@ -363,6 +365,7 @@
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
<supported-locale>ja</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>conf.bundles.Resource</resource-bundle>
<window>
@@ -390,6 +393,7 @@
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
<supported-locale>ja</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>conf.bundles.Resource</resource-bundle>
<window>
<window-name>IdentityAdminPortletWindow</window-name>
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/resources/test/deployment/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/resources/test/deployment/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/resources/test/deployment/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
@@ -27,6 +27,7 @@
<instance>
<display-name xml:lang="fr">Mon instance de User portlet</display-name>
<display-name xml:lang="en">My User portlet instance</display-name>
+ <display-name xml:lang="pt_BR">Minha instância do portlet de Usuário</display-name>
<instance-id>UserPortletInstance</instance-id>
<portlet-ref>UserPortlet</portlet-ref>
</instance>
Deleted: branches/Enterprise_Portal_Platform_4_3/core-admin/src/bin/portal-admin-war/img/locales/br.gif
===================================================================
(Binary files differ)
Added: branches/Enterprise_Portal_Platform_4_3/core-admin/src/bin/portal-admin-war/img/locales/br.gif
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/bin/portal-admin-war/img/locales/br.gif (rev 0)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/bin/portal-admin-war/img/locales/br.gif 2009-04-06 10:50:34 UTC (rev 13159)
@@ -0,0 +1,3 @@
+GIF89a
+/�O�}Ma�L�zf�F%�Y@�8X�Haq��* �T����0H�w�Y:�q��0�\\v�+�^��S��G��2Ul���F6���"T��Y���3� �Y8�o��6��1���Mf��݂)�_0O��̱4�f��6$�^�Ʉ��kt�s3�d���:� �W'�_X�� �U
+L- |H�Y�m�9t~��j��T����`�"W� �E�SN����&�FH�b�*kfX)��L�0�fܑ0�Z�L�]b�d�>����*����� B�E��D �E�`��2���/�$�͂ �B� 4�a� �0�`�x�͆ n�@�(�a�=�Ή(���)�N@
\ No newline at end of file
Copied: branches/Enterprise_Portal_Platform_4_3/core-admin/src/bin/portal-admin-war/img/locales/pt_BR.gif (from rev 13100, branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/locales/pt_BR.gif)
===================================================================
(Binary files differ)
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-04-06 10:50:34 UTC (rev 13159)
@@ -23,7 +23,7 @@
PORTLET_INSTANCES=Inst\u00E2ncias de Portlets
INSTANCE_DELETE=excluir inst\u00E2ncia
-PORTLET_CAUSING_REFERENCING_NOT_ABLE=.Janelas que referenciam essa inst\u00E2ncia de portlet n\u00E3o ser\u00E3o capazes de exibir o seu conte\u00FAdo
+PORTLET_CAUSING_REFERENCING_NOT_ABLE=Janelas que referenciam essa inst\u00E2ncia de portlet n\u00E3o ser\u00E3o capazes de exibir o seu conte\u00FAdo
ARE_YOU_SURE_DELETE=Tem certeza de que deseja excluir esta inst\u00E2ncia de portlet?
DASHBOARD_THEME_PROPERTIES=Propriedades do Tema do Meu Portal
CONFIGURE_DASHBOARD_SETTINGS=Configurar defini\u00E7\u00F5es do Meu Portal
@@ -121,7 +121,7 @@
COMMON_APPEND_VALUE=Adicionar um valor
COMMON_PROPERTIES=Propriedades
COMMON_ADD_PROPERTY=Adicionar uma propriedade
-COMMON_SELECT_PREDEFINED_PROPERTY=Selecione propriedades as pr\u00E9-definidas
+COMMON_SELECT_PREDEFINED_PROPERTY=Selecione as propriedades pr\u00E9-definidas
COMMON_OR=ou
COMMON_ENTER_PROPERTY_NAME=Digite o nome da propriedade
COMMON_MANAGE_PROPERTIES=Ger\u00EAnciar propriedades atuais
@@ -150,7 +150,7 @@
COMMON_PORTLET_DESCRIPTION=Descri\u00E7\u00E3o do portlet
COMMON_PORTLET_TITLE=T\u00EDtulo do portlet
COMMON_PORTLET_KEYWORDS=Palavras-chave do portlet
-COMMON_PORTLET_LOCALES=L\u00EDnguas do portlet
+COMMON_PORTLET_LOCALES=Idiomas do portlet
COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Nomes de exibi\u00E7\u00E3o da Inst\u00E2ncia do Portlet
COMMON_ADD_INSTANCE_DISPLAY_NAMES=Adicionar Nome de Exibi\u00E7\u00E3o para Inst\u00E2ncia
COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Nome de Exibi\u00E7\u00E3o Atual para Inst\u00E2ncia
@@ -162,7 +162,7 @@
COMMON_DOWN=Baixo
COMMON_NEW_VALUE=Novo valor
COMMON_APPEND=Adicionar
-COMMON_LOCALE=Nacionalidade
+COMMON_LOCALE=Idioma
COMMON_DISPLAY_NAME=Nome de Exibi\u00E7\u00E3o
COMMON_MEDIA_TYPES=Tipos de M\u00EDdia
COMMON_WINDOW_STATES=Estados da Janela
@@ -172,7 +172,7 @@
COMMON_ID=Id
COMMON_TITLE=T\u00EDtulo
COMMON_KEYWORDS=Palavras-chave
-COMMON_LOCALES=Nacionalidades
+COMMON_LOCALES=Idiomas
COMMON_TRANSPORT_GUARANTEES=Garantias de Transporte
COMMON_CACHE_EXPIRATION=Expira\u00E7\u00E3o do Cache
COMMON_SECONDS=segundos
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
@@ -31,6 +31,7 @@
<instance>
<display-name xml:lang="en">Administration portlet</display-name>
<display-name xml:lang="fr">Portlet d'administration</display-name>
+ <display-name xml:lang="pt_BR">Portlet de administração</display-name>
<instance-id>AdminPortletInstance</instance-id>
<portlet-ref>AdminPortlet</portlet-ref>
<security-constraint>
@@ -43,6 +44,8 @@
</deployment>
<deployment>
<instance>
+ <display-name xml:lang="en">Dashboard Configurator portlet</display-name>
+ <display-name xml:lang="pt_BR">Portlet de configuração do Meu Portal</display-name>
<instance-id>DashboardConfigPortletInstance</instance-id>
<portlet-ref>DashboardConfigPortlet</portlet-ref>
</instance>
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -30,7 +30,8 @@
<portlet>
<description>Administration Portlet</description>
<portlet-name>AdminPortlet</portlet-name>
- <display-name>Administration Portlet</display-name>
+ <display-name xml:lang="en">Administration Portlet</display-name>
+ <display-name xml:lang="pt_BR">Portlet de Administração</display-name>
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
@@ -47,6 +48,7 @@
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
<supported-locale>de</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<portlet-info>
<title>Management Portlet</title>
<keywords>management,admin</keywords>
@@ -55,7 +57,8 @@
<portlet>
<description>Dashboard Configurator Portlet</description>
<portlet-name>DashboardConfigPortlet</portlet-name>
- <display-name>Dashboard Configurator Portlet</display-name>
+ <display-name xml:lang="en">Dashboard Configurator Portlet</display-name>
+ <display-name xml:lang="pt_BR">Portlet de Configuração do Meu Portal</display-name>
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
@@ -70,6 +73,8 @@
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
</supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<portlet-info>
<title>Dashboard Configurator Portlet</title>
<keywords>management,admin</keywords>
Modified: branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -33,6 +33,7 @@
<page-name>CMS</page-name>
<supported-locale>en</supported-locale>
<supported-locale>ja</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>Resource</resource-bundle>
<window>
<window-name>CMSAdminPortletWindow</window-name>
Modified: branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties 2009-04-06 10:50:34 UTC (rev 13159)
@@ -26,7 +26,7 @@
IDENTITY_APPLICATION_NOT_AVAILABLE=Porlet n\u00E3o dispon\u00EDvel. Verifique sua configura\u00E7\u00E3o e log de erro para mais informa\u00E7\u00F5es.
IDENTITY_WELCOME=Bem-vindo
-IDENTITY_REGISTER=Registrar
+IDENTITY_REGISTER=Registrar-se
IDENTITY_LOST_PASSWORD=Esqueceu Senha
IDENTITY_NOT_LOGGED_IN=Voc\u00EA n\u00E3o est\u00E1 autenticado no portal.
IDENTITY_CREATE_ACCOUNT=Voc\u00EA pode criar uma conta.
Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -376,6 +376,7 @@
<page-name>TestWithAjax</page-name>
<display-name xml:lang="en">TestWithAjax</display-name>
<display-name xml:lang="it">TestConAjax</display-name>
+ <display-name xml:lang="pt_BR">TesteComAjax</display-name>
<properties>
<property>
<name>theme.dyna.partial_refresh_enabled</name>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -77,9 +77,11 @@
<portlet>
<description>A test portlet</description>
<description xml:lang="fr">C'est une portlet de test</description>
+ <description xml:lang="pt_BR">Portlet de teste</description>
<portlet-name>TestPortlet</portlet-name>
<display-name>Test Portlet</display-name>
<display-name xml:lang="fr">Portlet Test</display-name>
+ <display-name xml:lang="pt_BR">Portlet de Teste</display-name>
<portlet-class>org.jboss.portal.core.samples.basic.TestPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
@@ -31,6 +31,7 @@
<instance>
<display-name xml:lang="en">Catalog portlet</display-name>
<display-name xml:lang="fr">Portlet catalogue</display-name>
+ <display-name xml:lang="pt_BR">Portlet catálogo</display-name>
<instance-id>CatalogPortletInstance</instance-id>
<portlet-ref>CatalogPortlet</portlet-ref>
</instance>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
@@ -42,6 +42,7 @@
<deployment>
<instance>
<display-name xml:lang="en">Catalog Portlet</display-name>
+ <display-name xml:lang="pt_BR">Portlet de Catálogo</display-name>
<instance-id>CoordinationShoppingCatalogPortletInstance</instance-id>
<portlet-ref>CoordinationShoppingCatalog</portlet-ref>
</instance>
@@ -49,6 +50,7 @@
<deployment>
<instance>
<display-name xml:lang="en">Cart Portlet</display-name>
+ <display-name xml:lang="pt_BR">Portlet de Carrinho de Compras</display-name>
<instance-id>CoordinationShoppingCartPortletInstance</instance-id>
<portlet-ref>CoordinationShoppingCart</portlet-ref>
</instance>
Copied: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_pt.jsp (from rev 13100, branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_pt.jsp)
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_pt.jsp (rev 0)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_pt.jsp 2009-04-06 10:50:34 UTC (rev 13159)
@@ -0,0 +1,64 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ JBoss, a division of Red Hat ~
+~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+~ contributors as indicated by the @authors tag. See the ~
+~ copyright.txt in the distribution for a full listing of ~
+~ individual contributors. ~
+~ ~
+~ This is free software; you can redistribute it and/or modify it ~
+~ under the terms of the GNU Lesser General Public License as ~
+~ published by the Free Software Foundation; either version 2.1 of ~
+~ the License, or (at your option) any later version. ~
+~ ~
+~ This software is distributed in the hope that it will be useful, ~
+~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+~ Lesser General Public License for more details. ~
+~ ~
+~ You should have received a copy of the GNU Lesser General Public ~
+~ License along with this software; if not, write to the Free ~
+~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+
+<table border="0" cellspacing="2" cellpadding="2">
+ <tr>
+ <td align="center"><a href="http://portal.demo.jboss.com" target="_blank"><img
+ src="<portlet:resourceURL id='dodemo'/>" border="0"
+ alt="Experimente a �ltima vers�o do JBoss Portal, ao vivo e online." /></a>
+ <a href="http://labs.jboss.com/portal/jbossportal/download/index.html" target="_blank"><img
+ src="<portlet:resourceURL id='getcode'/>" border="0"
+ alt="Baixe o JBoss Portal e tenha-o funcionando em minutos." /></a>
+ <a href="http://www.portletswap.com" target="_blank"><img
+ src="<portlet:resourceURL id='accessorize'/>" border="0"
+ alt="Baixe portlets e leiautes para a sua nova instala��o do JBoss Portal." /></a></td>
+ </tr>
+ <tr>
+ <td></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate">
+ <p class="portlet-font">Esta é uma instalação do <strong><%= PortalConstants.VERSION %></strong>.
+ Você pode fazer o <span style="font-style:italic;">Login</span> a qualquer momento, utilizando o link localizado no canto superior direito desta página,
+ com as seguintes credenciais:
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="center">
+ <strong>user/user</strong> ou <strong>admin/admin</strong>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ Se você precisar de orientação no que diz respeito à navegação, configuração, ou de como operar o portal, por favor, veja a
+ nossa <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">documentação online</a>.
+ </td>
+ </tr>
+</table>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
@@ -31,6 +31,7 @@
<instance>
<display-name xml:lang="en">Welcome portlet</display-name>
<display-name xml:lang="fr">Portlet de bienvenue</display-name>
+ <display-name xml:lang="pt_BR">Portlet de bem-vindo</display-name>
<instance-id>JSPPortletInstance</instance-id>
<portlet-ref>JSPPortlet</portlet-ref>
</instance>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -39,6 +39,7 @@
<supported-locale>en</supported-locale>
<supported-locale>fr</supported-locale>
<supported-locale>de</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>Resource</resource-bundle>
</portlet>
</portlet-app>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -32,10 +32,13 @@
<if-exists>keep</if-exists>
<page>
<page-name>News</page-name>
+ <display-name xml:lang="en">News</display-name>
+ <display-name xml:lang="pt_BR">Notícias</display-name>
<supported-locale>fr</supported-locale>
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
<supported-locale>ru</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>NewsResource</resource-bundle>
<properties>
<property>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
@@ -31,6 +31,7 @@
<instance>
<display-name xml:lang="en">RSS portlet JBoss Portal</display-name>
<display-name xml:lang="fr">Portlet RSS de JBoss Portal</display-name>
+ <display-name xml:lang="pt_BR">Portlet de RSS do JBoss Portal</display-name>
<instance-id>NewsPortletInstance</instance-id>
<portlet-ref>NewsPortlet</portlet-ref>
</instance>
@@ -40,6 +41,7 @@
<instance>
<display-name xml:lang="en">RSS portlet Yahoo finance RHT</display-name>
<display-name xml:lang="fr">Portlet RSS de Yahoo Finance RHT</display-name>
+ <display-name xml:lang="pt_BR">Portlet de RSS do Yahoo Finance RHT</display-name>
<instance-id>NewsPortletInstance2</instance-id>
<portlet-ref>NewsPortlet</portlet-ref>
<preferences>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -55,6 +55,7 @@
<supported-locale>fr</supported-locale>
<supported-locale>it</supported-locale>
<supported-locale>ru</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>NewsResource</resource-bundle>
<portlet-info>
<title>News Feeds</title>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -35,6 +35,7 @@
<display-name xml:lang="en">Samples</display-name>
<display-name xml:lang="fr">Exemples</display-name>
<display-name xml:lang="it">Esempi</display-name>
+ <display-name xml:lang="pt_BR">Exemplos</display-name>
<!--
<properties>
<property>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_pt_BR.properties 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_pt_BR.properties 2009-04-06 10:50:34 UTC (rev 13159)
@@ -20,15 +20,15 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-javax.portlet.title=Usu\u00e1rios atuais
+javax.portlet.title=Usu\u00E1rios atuais
javax.portlet.keywords=sample,test
-NO_USER_ONLINE=Nenhum usu\u00e1rio on-line
-ONE_USER_ONLINE=Voc\u00ea \u00e9 o \u00fanico usu\u00e1rio on-line
+NO_USER_ONLINE=Nenhum usu\u00E1rio online
+ONE_USER_ONLINE=Voc\u00EA \u00E9 o \u00FAnico usu\u00E1rio online
USERS_ONLINE_0=Existem <b>
-USERS_ONLINE_1=</b> usu\u00e1rios on-line
+USERS_ONLINE_1=</b> usu\u00E1rios online
USERS_ARE_0=<b>
USERS_ARE_1=</b>
USERS_WHICH_0=Entre eles: <b>
-USERS_WHICH_1=</b> est\u00e1 conectado:
-USERS_WHICH_2=</b> est\u00e1 conectado:
+USERS_WHICH_1=</b> est\u00E1 conectado\:
+USERS_WHICH_2=</b> est\u00E1 conectado\:
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
@@ -30,6 +30,7 @@
<deployment>
<instance>
<display-name xml:lang="en">Who's online portlet</display-name>
+ <display-name xml:lang="pt_BR">Quem está online portlet</display-name>
<instance-id>CurrentUsersPortletInstance</instance-id>
<portlet-ref>CurrentUsersPortlet</portlet-ref>
</instance>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -43,6 +43,7 @@
<supported-locale>fr</supported-locale>
<supported-locale>de</supported-locale>
<supported-locale>ru</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>Resource</resource-bundle>
<portlet-preferences>
<preference>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_pt_BR.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_pt_BR.properties 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_pt_BR.properties 2009-04-06 10:50:34 UTC (rev 13159)
@@ -22,7 +22,7 @@
################################################################################
javax.portlet.preference.name.RssXml=URL do feed RSS
-javax.portlet.preference.name.expires=Tempo de expira\u00e7\u00e3o
-org.jboss.portal.object.name.Weather=Tempo
+javax.portlet.preference.name.expires=Tempo de expira\u00E7\u00E3o
+org.jboss.portal.object.name.default.Weather=Tempo
org.jboss.portal.instance.name.WeatherPortletInstance=Tempo Portlet
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/default-object.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/default-object.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -32,9 +32,12 @@
<if-exists>overwrite</if-exists>
<page>
<page-name>Weather</page-name>
+ <display-name xml:lang="en">Weather</display-name>
+ <display-name xml:lang="pt_BR">Tempo</display-name>
<supported-locale>fr</supported-locale>
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>WeatherResource</resource-bundle>
<properties>
<property>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
@@ -31,6 +31,7 @@
<resource-bundle>WeatherResource</resource-bundle>
<supported-locale>fr</supported-locale>
<supported-locale>en</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<instance-id>WeatherPortletInstance</instance-id>
<portlet-ref>WeatherPortlet</portlet-ref>
</instance>
Modified: branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -54,6 +54,7 @@
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
<supported-locale>ru</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>WeatherResource</resource-bundle>
<portlet-info>
<title>Weather Portlet</title>
Modified: branches/Enterprise_Portal_Platform_4_3/core-search/src/resources/portal-search-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-search/src/resources/portal-search-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-search/src/resources/portal-search-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
Modified: branches/Enterprise_Portal_Platform_4_3/core-search/src/resources/portal-search-war/WEB-INF/portlet.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-search/src/resources/portal-search-war/WEB-INF/portlet.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-search/src/resources/portal-search-war/WEB-INF/portlet.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -43,6 +43,7 @@
</supports>
<supported-locale>en</supported-locale>
<supported-locale>fr</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>Resource</resource-bundle>
<portlet-info>
<title>Search Portlet</title>
Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2007, Red Hat Middleware, LLC, and individual ~
@@ -27,6 +27,7 @@
<instance>
<display-name xml:lang="en">WSRP admin portlet</display-name>
<display-name xml:lang="fr">Portlet d'administration WSRP</display-name>
+ <display-name xml:lang="pt_BR">Portlet de administração WSRP</display-name>
<instance-id>WSRPConfigurationPortletInstance</instance-id>
<portlet-ref>WSRPConfigurationPortlet</portlet-ref>
<security-constraint>
Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -44,6 +44,7 @@
</supports>
<supported-locale>en</supported-locale>
<supported-locale>fr</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>WSRPConfigurationResource</resource-bundle>
<portlet-info>
<title>WSRP Configuration</title>
Modified: branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
Modified: branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-war/WEB-INF/portlet-instances.xml 2009-04-06 10:34:36 UTC (rev 13158)
+++ branches/Enterprise_Portal_Platform_4_3/widget/src/resources/portal-widget-war/WEB-INF/portlet-instances.xml 2009-04-06 10:50:34 UTC (rev 13159)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r13158 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-06 06:34:36 -0400 (Mon, 06 Apr 2009)
New Revision: 13158
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
Log:
Should really be pt-BR (instead of pt_BR) but a bug is preventing me from doing it
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2009-04-06 10:18:44 UTC (rev 13157)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2009-04-06 10:34:36 UTC (rev 13158)
@@ -30,8 +30,8 @@
<portlet>
<description>Administration Portlet</description>
<portlet-name>AdminPortlet</portlet-name>
- <display-name lang="en">Administration Portlet</display-name>
- <display-name lang="pt_BR">Portlet de Administração</display-name>
+ <display-name xml:lang="en">Administration Portlet</display-name>
+ <display-name xml:lang="pt_BR">Portlet de Administração</display-name>
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
@@ -57,8 +57,8 @@
<portlet>
<description>Dashboard Configurator Portlet</description>
<portlet-name>DashboardConfigPortlet</portlet-name>
- <display-name lang="en">Dashboard Configurator Portlet</display-name>
- <display-name lang="pt_BR">Portlet de Configuração do Meu Portal</display-name>
+ <display-name xml:lang="en">Dashboard Configurator Portlet</display-name>
+ <display-name xml:lang="pt_BR">Portlet de Configuração do Meu Portal</display-name>
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
@@ -73,6 +73,8 @@
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
</supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<portlet-info>
<title>Dashboard Configurator Portlet</title>
<keywords>management,admin</keywords>
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r13157 - branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/locales.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-06 06:18:44 -0400 (Mon, 06 Apr 2009)
New Revision: 13157
Added:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/locales/br.gif
Log:
Put br flag back
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/locales/br.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/locales/br.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 2 months
- 1
- 0