JBoss Portal SVN: r12864 - branches/JBoss_Portal_Branch_2_7/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-23 08:08:33 -0500 (Mon, 23 Feb 2009)
New Revision: 12864
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
Log:
Update module dependencies
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-02-23 12:24:53 UTC (rev 12863)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-02-23 13:08:33 UTC (rev 12864)
@@ -64,12 +64,12 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/common" version="1.2.4"/>
<componentref name="jboss-portal/modules/web" version="1.2.3"/>
<componentref name="jboss-portal/modules/test" version="1.0.4"/>
- <componentref name="jboss-portal/modules/portlet" version="2.0.5"/>
- <componentref name="jboss-portal/modules/identity" version="1.0.6"/>
- <componentref name="jboss-portal/modules/cms" version="1.2.2"/>
+ <componentref name="jboss-portal/modules/portlet" version="2.0.6"/>
+ <componentref name="jboss-portal/modules/identity" version="1.0.8"/>
+ <componentref name="jboss-portal/modules/cms" version="1.2.4"/>
<componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.4"/>
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12863 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-23 07:24:53 -0500 (Mon, 23 Feb 2009)
New Revision: 12863
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
Log:
- JBPORTAL-2317:
+ Properly deal with creation and renaming operation error display and name validation
+ Moved generic code from concrete subclasses to CoordinationManagerBean.CoordinationBean for rename and create method
+ Added h:message tags and ids where needed in editCoordination.xhtml
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2009-02-23 11:51:07 UTC (rev 12862)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2009-02-23 12:24:53 UTC (rev 12863)
@@ -129,27 +129,29 @@
return result;
}
- public String create()
+ protected void internalRename(String oldName, String newName) throws IllegalCoordinationException
{
+ managerBean.getCoordinationService().renameAliasBinding(managerBean.getSelectedPage(), oldName, newName);
+ }
+
+ protected void internalCreate() throws IllegalCoordinationException
+ {
if (aliasName != null)
{
- try
+ HashSet<QName> qNames = new HashSet<QName>();
+ for (String qName : originalQNames)
{
- HashSet<QName> qNames = new HashSet<QName>();
- for (String qName : originalQNames)
- {
- qNames.add(QName.valueOf(qName));
- }
- managerBean.getCoordinationService().setAliasBinding(managerBean.getSelectedPage(), aliasName, qNames);
+ qNames.add(QName.valueOf(qName));
}
- catch (IllegalCoordinationException e)
- {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
+ managerBean.getCoordinationService().setAliasBinding(managerBean.getSelectedPage(), aliasName, qNames);
}
- return resetSelection();
}
+ protected String getBeanName()
+ {
+ return aliasName;
+ }
+
public String resetSelection()
{
aliasName = null;
@@ -164,12 +166,6 @@
return resetSelection();
}
- public String rename(String oldName, String newName) throws IllegalCoordinationException
- {
- managerBean.getCoordinationService().renameAliasBinding(managerBean.getSelectedPage(), oldName, newName);
- return resetSelection();
- }
-
public void extractInfoFrom(Window window, PortletInfo info)
{
// retrieve metadata on public render parameters
@@ -225,9 +221,9 @@
}
@Override
- public String getCreationTargetName()
+ public String getObjectNameForMessages()
{
- return "aliasName";
+ return "alias";
}
public boolean isAlreadyExisting(String objectName)
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2009-02-23 11:51:07 UTC (rev 12862)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2009-02-23 12:24:53 UTC (rev 12863)
@@ -66,6 +66,7 @@
private CoordinationType selectedType;
private String newName;
static final String EDIT_COORDINATION = "editCoordination";
+ private static final String RENAME_COORDINATION = "renameCoordination";
private enum CoordinationType
{
@@ -136,12 +137,62 @@
public abstract String delete(String name) throws IllegalCoordinationException;
- public abstract String rename(String oldName, String newName) throws IllegalCoordinationException;
+ public String rename(String oldName, String newName)
+ {
+ if (isOldAndNewDifferent(oldName, newName))
+ {
+ if (checkNameValidity(newName, "renameForm:newName") != null)
+ {
+ try
+ {
+ internalRename(oldName, newName);
+ }
+ catch (IllegalCoordinationException e)
+ {
+ beanContext.createErrorMessageFrom(e);
+ }
+ }
+ else
+ {
+ // redisplay page with error message
+ return RENAME_COORDINATION;
+ }
+ }
+ return resetSelection();
+ }
+
+ protected abstract void internalRename(String oldName, String newName) throws IllegalCoordinationException;
+
public abstract void extractInfoFrom(Window window, PortletInfo info);
- public abstract String create() throws IllegalCoordinationException;
+ public String create()
+ {
+ String nameForMessages = getObjectNameForMessages();
+ String target = "create-" + nameForMessages + "-form:" + getAdditionalFormId() + nameForMessages + "Name";
+ if (checkNameValidity(getBeanName(), target) != null)
+ {
+ try
+ {
+ internalCreate();
+ }
+ catch (IllegalCoordinationException e)
+ {
+ beanContext.createErrorMessageFrom(e);
+ }
+ }
+ else
+ {
+ // do not reset the selection if the name is incorrect, let user modify it first...
+ // also gives the opportunity to display error messages
+ return null;
+ }
+ return resetSelection();
+ }
+
+ protected abstract void internalCreate() throws IllegalCoordinationException;
+
public String resetSelection()
{
managerBean.refresh();
@@ -163,12 +214,25 @@
public abstract String getObjectTypeName();
/**
- * Returns the name of the target for errors when creating/renaming a Coordination element. Made public so that it
- * can be accessed from CoordinationManagerBean
+ * Returns the object name used in identifiers for target of messages. Creation forms have id similar to:
+ * <code>created-getObjectNameForMessages()-form</code> while, input fields for these forms are named:
+ * <code>getObjectNameForMessages()Name</code>.
*
* @return
*/
- public abstract String getCreationTargetName();
+ protected abstract String getObjectNameForMessages();
+
+ protected abstract String getBeanName();
+
+ /**
+ * Additional form information for create form if needed.
+ *
+ * @return
+ */
+ protected String getAdditionalFormId()
+ {
+ return "";
+ }
}
public Page getSelectedPage()
@@ -399,7 +463,7 @@
}
catch (IllegalCoordinationException e)
{
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ beanContext.createErrorMessageFrom(e);
}
}
@@ -429,19 +493,19 @@
{
if (selectedType != null)
{
- if (!isOldAndNewDifferent(selectedName, newName))
+ CoordinationBean coordinationBean = selectedType.getBean();
+
+ // call rename on sub-bean and check that we're not requesting renaming again (in case an error occurred)
+ if (RENAME_COORDINATION.equals(coordinationBean.rename(selectedName, newName)))
{
- return null;
+ // error occurred: redisplay rename dialog
+ return RENAME_COORDINATION;
}
-
- CoordinationBean coordinationBean = selectedType.getBean();
- newName = checkNameValidity(newName, coordinationBean.getCreationTargetName());
- if (newName != null)
+ else
{
- coordinationBean.rename(selectedName, newName);
+ // all went well: refresh!
refresh();
}
-
}
// reset selection
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2009-02-23 11:51:07 UTC (rev 12862)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2009-02-23 12:24:53 UTC (rev 12863)
@@ -291,22 +291,24 @@
}
}
- public String create()
+ protected void internalRename(String oldName, String newName) throws IllegalCoordinationException
{
+ managerBean.getCoordinationService().renameEventWiring(managerBean.getSelectedPage(), oldName, newName);
+ }
+
+ protected void internalCreate() throws IllegalCoordinationException
+ {
if (currentWiring != null)
{
- try
- {
- managerBean.getCoordinationService().setEventWiring(currentWiring.getSources(), currentWiring.getDestinations(), currentWiring.getName());
- }
- catch (IllegalCoordinationException e)
- {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
+ managerBean.getCoordinationService().setEventWiring(currentWiring.getSources(), currentWiring.getDestinations(), currentWiring.getName());
}
- return resetSelection();
}
+ protected String getBeanName()
+ {
+ return currentWiring != null ? currentWiring.getName() : null;
+ }
+
public String resetSelection()
{
currentWiring = null;
@@ -324,12 +326,6 @@
return resetSelection();
}
- public String rename(String oldName, String newName) throws IllegalCoordinationException
- {
- managerBean.getCoordinationService().renameEventWiring(managerBean.getSelectedPage(), oldName, newName);
- return resetSelection();
- }
-
public void extractInfoFrom(Window window, PortletInfo info)
{
// retrieve metadata on events
@@ -486,11 +482,17 @@
}
@Override
- public String getCreationTargetName()
+ public String getObjectNameForMessages()
{
- return "wiringName";
+ return "wiring";
}
+ @Override
+ protected String getAdditionalFormId()
+ {
+ return "COORDINATION_EVENT_CREATE_STEP5:";
+ }
+
public boolean isAlreadyExisting(String objectName)
{
return displayEventWirings.containsKey(objectName);
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2009-02-23 11:51:07 UTC (rev 12862)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2009-02-23 12:24:53 UTC (rev 12863)
@@ -162,8 +162,13 @@
}
}
- public String create() throws IllegalCoordinationException
+ protected void internalRename(String oldName, String newName) throws IllegalCoordinationException
{
+ managerBean.getCoordinationService().renameParameterBinding(managerBean.getSelectedPage(), oldName, newName);
+ }
+
+ protected void internalCreate() throws IllegalCoordinationException
+ {
if (windowBindingName != null)
{
Map<Window, Set<QName>> windowBinding = new HashMap<Window, Set<QName>>();
@@ -178,8 +183,11 @@
managerBean.getCoordinationService().setParameterBinding(windowBindingName, windowBinding);
}
+ }
- return resetSelection();
+ protected String getBeanName()
+ {
+ return windowBindingName;
}
public String resetSelection()
@@ -196,12 +204,6 @@
return resetSelection();
}
- public String rename(String name, String newName) throws IllegalCoordinationException
- {
- managerBean.getCoordinationService().renameParameterBinding(managerBean.getSelectedPage(), name, newName);
- return resetSelection();
- }
-
/**
* Enforce the fact that you can only select one qname per window
*
@@ -377,9 +379,9 @@
}
@Override
- public String getCreationTargetName()
+ public String getObjectNameForMessages()
{
- return "bindingName";
+ return "binding";
}
public boolean isAlreadyExisting(String objectName)
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-02-23 11:51:07 UTC (rev 12862)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-02-23 12:24:53 UTC (rev 12863)
@@ -43,7 +43,7 @@
<div id="aliasBindings" class="coordination-section">
<h3 class="sectionTitle tenpx-bottom" style="margin-top: 3px;">#{bundle.COORDINATION_ALIAS_CREATE}</h3>
<h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" rendered="#{empty aliasManager.availableRenderParameters}"/>
- <h:form rendered="#{!empty aliasManager.availableRenderParameters}">
+ <h:form rendered="#{!empty aliasManager.availableRenderParameters}" id="create-alias-form">
<div class="float-left tenpx-right">
<h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP1}</h4>
<h:selectManyListbox id="alias" size="5" value="#{aliasManager.originalQNames}"
@@ -55,8 +55,11 @@
<h:panelGroup rendered="#{!empty aliasManager.originalQNames}">
<h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP2}</h4>
<div class="full-width">
- <span><h:inputText id="aliasName" value="#{aliasManager.aliasName}"/></span>
<span>
+ <h:inputText id="aliasName" value="#{aliasManager.aliasName}"/>
+ <h:message for="aliasName" errorClass="portlet-msg-error"/>
+ </span>
+ <span>
<h:commandButton value="#{bundle.COORDINATION_ALIAS_CREATE_CREATE}"
action="#{aliasManager.create}" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasManager.cancel}"
@@ -138,7 +141,7 @@
<!-- Create parameter binding -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_CREATE}</h3>
<h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" rendered="#{empty parameterManager.availableParameterWindowPairs}"/>
- <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}">
+ <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}" id="create-binding-form">
<div class="float-left tenpx-right">
<h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP1}</h4>
<h:selectManyListbox id="parameterWindowPair" size="5" value="#{parameterManager.selectedParameterWindowPairs}"
@@ -151,8 +154,11 @@
<div class="float-left paramBinding-step2">
<h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP2}</h4>
<div class="full-width">
- <span><h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/></span>
<span>
+ <h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/>
+ <h:message for="bindingName" errorClass="portlet-msg-error"/>
+ </span>
+ <span>
<h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}"
action="#{parameterManager.create}" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{parameterManager.cancel}"
@@ -236,7 +242,7 @@
<!-- Create new event wiring -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3>
<h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/>
- <h:form rendered="#{!empty eventManager.sourceEvents}">
+ <h:form rendered="#{!empty eventManager.sourceEvents}" id="create-wiring-form">
<div class="half-width float-left">
<div class="full-width pad5">
<h4>#{bundle.COORDINATION_EVENT_CREATE_STEP1}</h4>
@@ -318,6 +324,7 @@
<div class="margin10">
<h4>#{bundle.COORDINATION_EVENT_CREATE_STEP5}</h4>
<h:inputText id="wiringName" value="#{eventManager.wiringName}"/>
+ <h:message for="wiringName" errorClass="portlet-msg-error"/>
<h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventManager.create}"
styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventManager.cancel}"
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12862 - in modules/portlet/tags/JBP_PORTLET_2_0_6/docs: user-guide and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-23 06:51:07 -0500 (Mon, 23 Feb 2009)
New Revision: 12862
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_6/docs/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/docs/user-guide/pom.xml
Log:
oups
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/docs/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/docs/pom.xml 2009-02-23 11:29:43 UTC (rev 12861)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/docs/pom.xml 2009-02-23 11:51:07 UTC (rev 12862)
@@ -10,7 +10,7 @@
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Docs Aggregator</name>
- <version>2.0-Beta1</version>
+ <version>2.0.6</version>
<url>http://labs.jboss.com/jbossportal</url>
<modules>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/docs/user-guide/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/docs/user-guide/pom.xml 2009-02-23 11:29:43 UTC (rev 12861)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/docs/user-guide/pom.xml 2009-02-23 11:51:07 UTC (rev 12862)
@@ -11,7 +11,7 @@
</parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>user-guide-${translation}</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<packaging>jdocbook</packaging>
<name>User_Guide_(${translation})</name>
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12861 - in modules/common/tags/JBP_COMMON_1_2_4/common/src: test/java/org/jboss/portal/test/common/util and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-23 06:29:43 -0500 (Mon, 23 Feb 2009)
New Revision: 12861
Modified:
modules/common/tags/JBP_COMMON_1_2_4/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java
modules/common/tags/JBP_COMMON_1_2_4/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java
Log:
More parameter validation
Modified: modules/common/tags/JBP_COMMON_1_2_4/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_4/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java 2009-02-23 11:02:23 UTC (rev 12860)
+++ modules/common/tags/JBP_COMMON_1_2_4/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java 2009-02-23 11:29:43 UTC (rev 12861)
@@ -36,7 +36,7 @@
public class ParameterValidation
{
public final static Pattern CSS_DISTANCE = Pattern.compile("\\d+\\W*(em|ex|px|in|cm|mm|pt|pc|%)?");
- public final static Pattern XSS_CHECK = Pattern.compile("([^<>\\(\\)=\\\\](?!%5c))*", Pattern.CASE_INSENSITIVE);
+ public final static Pattern XSS_CHECK = Pattern.compile("([^<>\\(\\)=\\\\](?<!%5C))*", Pattern.CASE_INSENSITIVE);
/**
* Implements a behavior to be executed in case a value fails to be validated. Uses the Chain of responsibility
Modified: modules/common/tags/JBP_COMMON_1_2_4/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_4/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java 2009-02-23 11:02:23 UTC (rev 12860)
+++ modules/common/tags/JBP_COMMON_1_2_4/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java 2009-02-23 11:29:43 UTC (rev 12861)
@@ -100,14 +100,25 @@
public void testSanitizeFromPatternXSSCheck()
{
String defaultValue = "default";
+ assertEquals("foo", ParameterValidation.sanitizeFromPattern("foo", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals("/foo/bar", ParameterValidation.sanitizeFromPattern("/foo/bar", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals("testé", ParameterValidation.sanitizeFromPattern("testé", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals("test�", ParameterValidation.sanitizeFromPattern("test�", ParameterValidation.XSS_CHECK, defaultValue));
+
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/\\/baz", ParameterValidation.XSS_CHECK, defaultValue));
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/%5c/baz", ParameterValidation.XSS_CHECK, defaultValue));
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/%5C/baz", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("%5C", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("%5C\t ", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("\t\n%5c", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/%5C", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/%5c", ParameterValidation.XSS_CHECK, defaultValue));
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("http://qa.cwcportal.aviation.ge.com:80/portal/auth/portal/main/cwcportal-" +
"Home/cwcportal-Home-LeftNavigationPortletWindow?action=1&org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=/pages/h" +
"omeleftnavigation.jsp<script>window.open(\"http://3.211.64.16/XSS/ \", \"XSS\",\"width=550,height=290\")</script>",
ParameterValidation.XSS_CHECK, defaultValue));
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/</baz", ParameterValidation.XSS_CHECK, defaultValue));
+
}
public void testSanitizeFromValuesNullValue()
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12860 - branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-23 06:02:23 -0500 (Mon, 23 Feb 2009)
New Revision: 12860
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
Log:
JBPORTAL-2318: Portlet header layout in Edit Mode is broken - only in left column dashboard
There is no universal solution, but that may work out better in common cases
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-23 10:53:13 UTC (rev 12859)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-23 11:02:23 UTC (rev 12860)
@@ -172,7 +172,7 @@
#regionA {
/* test to swap columns...
float: right; */
- width: 30%;
+ width: 35%;
float: left;
margin: 0px;
padding: 0px;
@@ -186,7 +186,7 @@
/*two column layout
margin: 0 0 0 30%;*/
padding: 0px; /* test to add 3rd region in layout...*/
- width: 67%;
+ width: 62%;
float: left; /*height: 300px;*/
}
@@ -509,7 +509,6 @@
text-indent: 5px;
padding-top: 5px;
padding-bottom: 6px;
- width:65%;
display:block;
margin-right:10px;
}
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12859 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test/selenium and 1 other directories.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-02-23 05:53:13 -0500 (Mon, 23 Feb 2009)
New Revision: 12859
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
Log:
[JBPORTAL-2308] - locators to identity managment added, fix of role create element
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-02-23 09:38:02 UTC (rev 12858)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-02-23 10:53:13 UTC (rev 12859)
@@ -134,6 +134,7 @@
<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>
@@ -154,7 +155,7 @@
<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" />
@@ -174,6 +175,8 @@
<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" />
@@ -194,7 +197,7 @@
<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>
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-02-23 09:38:02 UTC (rev 12858)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-02-23 10:53:13 UTC (rev 12859)
@@ -47,7 +47,7 @@
exit 0;
fi
ant -f build.xml copyApps
- ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true"
+ ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true"
elif [ $1 = "end2end" ]; then
if [ -z "$2" -o ! -f "$2" ]; then
echo
@@ -55,7 +55,7 @@
exit 0;
fi
ant -f build.xml copyApps
- ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true"
+ ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true"
elif [ $1 = "perf" ]; then
if [ -z "$2" -o ! -f "$2" ]; then
echo
@@ -63,7 +63,7 @@
exit 0;
fi
ant -f build.xml copyApps
- ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/"
+ ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true"
elif [ $1 = "selenium" ]; then
ant -f build.xml run-src
elif [ $1 = "single" ]; then
@@ -77,6 +77,6 @@
echo "ERROR: Testclasss not set";
exit 0;
fi
- ant -f build.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3"
+ ant -f build.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3" -Dscreenshot="true" -Dhtml-src="true"
fi
fi
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-02-23 09:38:02 UTC (rev 12858)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-02-23 10:53:13 UTC (rev 12859)
@@ -14,70 +14,72 @@
@Test(groups = { "admin_ui" }, enabled = true)
public class IdentityAdminTestCase extends JBossPortalSeleniumTestCase {
- private static final String SEL_SEARCHUSER_LIMIT = "//select[contains(@id,'search-user-form:limit')]";
- private static final String SUB_EDIT_PROF = "//input[contains(@id,'profile-form:submit')]";
+ public String casePfx = "iden.man.";
- private static final String SUB_PAGIN_LEFT = "//input[contains(@id,'search-user-form1:prev-page')]";
- private static final String SUB_PAGIN_RIGHT = "//input[contains(@id,'search-user-form1:next-page')]";
+ private final String SEL_SEARCHUSER_LIMIT = getProp(casePfx + "sel.searchuser.limit", "//select[contains(@id,'search-user-form:limit')]");
+ private final String SUB_EDIT_PROF = getProp(casePfx + "sub.edit.prof", "//input[contains(@id,'profile-form:submit')]");
- private static final String SUB_EDIT_USER_EMAIL_CANCEL = "//input[contains(@id,'profile-form:cancel')]";
- private static final String INP_EDIT_USER_EMAIL = "//input[contains(@id,'profile-form:email')]";
- private static final String SUB_ROLE_SEARCH_USER = "//input[contains(@id,'search-user-form:search') and @type='submit']";
- private static final String INP_ROLE_SEARCH_USER = "//input[contains(@id,'search-user-form:searchString')]";
- private static final String SUB_EDIT_ROLE_SUBMIT = "//input[contains(@id,'edit-role-link:submit')]";
- private static final String SUB_EDIT_ROLE_CANCEL = "//input[contains(@id,'edit-role-link:cancel')]";
- private static final String INP_EDIT_ROLE_NAME = "//input[contains(@id,'edit-role-link:display-name')]";
- private static final String SUB_PASS_CHANGE_SUBMIT = "//input[contains(@name,'change-pwd-form:j_id31')]";
- private static final String SUB_PASS_CHANGE_CANCEL = "//input[contains(@id,'change-pwd-form:cancel')]";
- private static final String INP_PASS_CHANGE_P2 = "//input[contains(@id,':change-pwd-form:passwordCheck')]";
- private static final String INP_PASS_CHANGE_P1 = "//input[contains(@id,':change-pwd-form:password')]";
- private static final String LNK_CHANGE_PASS = "//a[contains(@id,':profile-form:change-pwd-adm-link')]";
- public static final String TBL_USERLIST = "//table[contains(@id,'search-user-form1:userlist')]";
- public static final String LNK_T_USRLIST_DEL = "//a[contains(@id,''search-user-form1:userlist:{0}:delete-user-link'')]";
- public static final String LNK_T_USRLIST_ROLES = "//a[contains(@id,''search-user-form1:userlist:{0}:assign-role-link'')]";
- public static final String LNK_T_USRLIST_DIS = "//a[contains(@id,''search-user-form1:userlist:{0}:enable-user-link'')]";
- public static final String LNK_T_USRLIST_EDIT = "//a[contains(@id,''search-user-form1:userlist:{0}:rename-link'')]";
+ private final String SUB_PAGIN_LEFT = getProp(casePfx + "sub.pagin.left", "//input[contains(@id,'search-user-form1:prev-page')]");
+ private final String SUB_PAGIN_RIGHT = getProp(casePfx + "sub.pagin.right", "//input[contains(@id,'search-user-form1:next-page')]");
- public static final String TBL_ROLELIST = "//table[contains(@id,':_viewRoot:roles-form:userlist')]";
+ private final String SUB_EDIT_USER_EMAIL_CANCEL = getProp(casePfx + "sub.edit.user.email.cancel", "//input[contains(@id,'profile-form:cancel')]");
+ private final String INP_EDIT_USER_EMAIL = getProp(casePfx + "inp.edit.user.email", "//input[contains(@id,'profile-form:email')]");
+ private final String SUB_ROLE_SEARCH_USER = getProp(casePfx + "sub.role.search.user", "//input[contains(@id,'search-user-form:search') and @type='submit']");
+ private final String INP_ROLE_SEARCH_USER = getProp(casePfx + "inp.role.search.user", "//input[contains(@id,'search-user-form:searchString')]");
+ private final String SUB_EDIT_ROLE_SUBMIT = getProp(casePfx + "sub.edit.role.submit", "//input[contains(@id,'edit-role-link:submit')]");
+ private final String SUB_EDIT_ROLE_CANCEL = getProp(casePfx + "sub.edit.role.cancel", "//input[contains(@id,'edit-role-link:cancel')]");
+ private final String INP_EDIT_ROLE_NAME = getProp(casePfx + "inp.edit.role.name", "//input[contains(@id,'edit-role-link:display-name')]");
+ private final String SUB_PASS_CHANGE_SUBMIT = getProp(casePfx + "sub.pass.change.submit", "//input[contains(@name,'change-pwd-form:j_id31')]");
+ private final String SUB_PASS_CHANGE_CANCEL = getProp(casePfx + "sub.pass.change.cancel", "//input[contains(@id,'change-pwd-form:cancel')]");
+ private final String INP_PASS_CHANGE_P2 = getProp(casePfx + "inp.pass.change.p2", "//input[contains(@id,':change-pwd-form:passwordCheck')]");
+ private final String INP_PASS_CHANGE_P1 = getProp(casePfx + "inp.pass.change.p1", "//input[contains(@id,':change-pwd-form:password')]");
+ private final String LNK_CHANGE_PASS = getProp(casePfx + "lnk.change.pass", "//a[contains(@id,':profile-form:change-pwd-adm-link')]");
+ public final String TBL_USERLIST = getProp(casePfx + "tbl.userlist", "//table[contains(@id,'search-user-form1:userlist')]");
+ public final String LNK_T_USRLIST_DEL = getProp(casePfx + "lnk.t.usrlist.del", "//a[contains(@id,''search-user-form1:userlist:{0}:delete-user-link'')]");
+ public final String LNK_T_USRLIST_ROLES = getProp(casePfx + "lnk.t.usrlist.roles", "//a[contains(@id,''search-user-form1:userlist:{0}:assign-role-link'')]");
+ public final String LNK_T_USRLIST_DIS = getProp(casePfx + "lnk.t.usrlist.dis", "//a[contains(@id,''search-user-form1:userlist:{0}:enable-user-link'')]");
+ public final String LNK_T_USRLIST_EDIT = getProp(casePfx + "lnk.t.usrlist.edit", "//a[contains(@id,''search-user-form1:userlist:{0}:rename-link'')]");
- public static final String LNK_T_ROLLIST_DEL = "//a[contains(@id,''roles-form:userlist:{0}:delete-role-link'')]";
- public static final String LNK_T_ROLLIST_MEMBERS = "//a[contains(@id,''roles-form:userlist:{0}:view-role-link'')]";
- public static final String LNK_T_ROLLIST_EDIT = "//a[contains(@id,''roles-form:userlist:{0}:edit-role-link'')]";
+ public final String TBL_ROLELIST = getProp(casePfx + "tbl.rolelist", "//table[contains(@id,'roles-form:userlist')]");
- public static final String TBL_ROLEMEMBERS = "//table[contains(@id,'role-members-form:role-data-table')]";
+ public final String LNK_T_ROLLIST_DEL = getProp(casePfx + "lnk.t.rollist.del", "//a[contains(@id,''roles-form:userlist:{0}:delete-role-link'')]");
+ public final String LNK_T_ROLLIST_MEMBERS = getProp(casePfx + "lnk.t.rollist.members", "//a[contains(@id,''roles-form:userlist:{0}:view-role-link'')]");
+ public final String LNK_T_ROLLIST_EDIT = getProp(casePfx + "lnk.t.rollist.edit", "//a[contains(@id,''roles-form:userlist:{0}:edit-role-link'')]");
- public static final String SUB_CONF_CREATE_USER = "//input[contains(@id,'confirm-form:admin')]";
- public static final String SUB_DELETE_ROLE = "//input[contains(@id,'delete-role-form:confirm')]";
- public static final String SUB_ROLE_CREATE = "//input[contains(@id,':_viewRoot:create-role-form:submit')]";
- public static final String INP_ROLEDISNAME = "//input[contains(@id,':_viewRoot:create-role-form:roledisplayname')]";
- public static final String INP_ROLENAME = "//input[contains(@id,':_viewRoot:create-role-form:rolename')]";
+ public final String TBL_ROLEMEMBERS = getProp(casePfx + "tbl.rolemembers", "//table[contains(@id,'role-members-form:role-data-table')]");
- public static final String LNK_ROLE_CREATE = "//a[contains(@id, ':_viewRoot:create-role-form:create-role-link')]";
- public static final String SUB_DEL_USER = "//input[contains(@id,'delete-user-form:submit')]";
- public static final String SUB_ASSIGN_ROLE = "//input[contains(@id,'assign-roles-form:submit')]";
- public static final String SUB_USER_ROLE = "//input[contains(@id,'register-role-form:submit')]";
- public static final String SUB_CREATE_USER = "//input[contains(@id,'register-form:submit')]";
- public static final String INP_PASSWORD_CHK = "//input[contains(@id,'register-form:passwordCheck')]";
- public static final String INP_PASSWORD = "//input[contains(@id,'register-form:password')]";
- public static final String INP_USEREMAIL = "//input[contains(@id,'register-form:email')]";
- public static final String INP_USERNAME = "//input[contains(@id,'register-form:username')]";
- public static final String SUB_SEARCH_USER = "//input[contains(@id,'search-user-form:search')]";
- public static final String INP_SEARCH_USER = "//input[contains(@id,'search-user-form:searchString')]";
- public static final String LNK_SEARCH_USER = "//a[contains(@id,'user-form:search-user-link')]";
- public static final String LNK_USERTAB = "//a[contains(@id,'role-temp-form:manage-users')]";
- public static final String LNK_USERMAIN = "//a[contains(@id,'user-temp-form1:user-adm-link')]";
+ public final String SUB_CONF_CREATE_USER = getProp(casePfx + "sub.conf.create.user", "//input[contains(@id,'confirm-form:admin')]");
+ public final String SUB_DELETE_ROLE = getProp(casePfx + "sub.delete.role", "//input[contains(@id,'delete-role-form:confirm')]");
+ public final String SUB_ROLE_CREATE = getProp(casePfx + "sub.role.create", "//input[contains(@id,'create-role-form:submit')]");
+ public final String INP_ROLEDISNAME = getProp(casePfx + "inp.roledisname", "//input[contains(@id,'create-role-form:roledisplayname')]");
+ public final String INP_ROLENAME = getProp(casePfx + "inp.rolename", "//input[contains(@id,'create-role-form:rolename')]");
- public static final String LNK_ROLETAB = "//a[contains(@id,'_viewRoot:user-temp-form:role-mgm-link')]";
+ public final String LNK_ROLE_CREATE = getProp(casePfx + "lnk.role.create", "//a[contains(@id, 'create-role-form:create-role-link')]");
+ public final String SUB_DEL_USER = getProp(casePfx + "sub.del.user", "//input[contains(@id,'delete-user-form:submit')]");
+ public final String SUB_ASSIGN_ROLE = getProp(casePfx + "sub.assign.role", "//input[contains(@id,'assign-roles-form:submit')]");
+ public final String SUB_USER_ROLE = getProp(casePfx + "sub.user.role", "//input[contains(@id,'register-role-form:submit')]");
+ public final String SUB_CREATE_USER = getProp(casePfx + "sub.create.user", "//input[contains(@id,'register-form:submit')]");
+ public final String INP_PASSWORD_CHK = getProp(casePfx + "inp.password.chk", "//input[contains(@id,'register-form:passwordCheck')]");
+ public final String INP_PASSWORD = getProp(casePfx + "inp.password", "//input[contains(@id,'register-form:password')]");
+ public final String INP_USEREMAIL = getProp(casePfx + "inp.useremail", "//input[contains(@id,'register-form:email')]");
+ public final String INP_USERNAME = getProp(casePfx + "inp.username", "//input[contains(@id,'register-form:username')]");
+ public final String SUB_SEARCH_USER = getProp(casePfx + "sub.search.user", "//input[contains(@id,'search-user-form:search')]");
+ public final String INP_SEARCH_USER = getProp(casePfx + "inp.search.user", "//input[contains(@id,'search-user-form:searchString')]");
+ public final String LNK_SEARCH_USER = getProp(casePfx + "lnk.search.user", "//a[contains(@id,'user-form:search-user-link')]");
+ public final String LNK_USERTAB = getProp(casePfx + "lnk.usertab", "//a[contains(@id,'role-temp-form:manage-users')]");
+ public final String LNK_USERMAIN = getProp(casePfx + "lnk.usermain", "//a[contains(@id,'user-temp-form1:user-adm-link')]");
- public static final String LNK_ROLEMAIN = "//a[contains(@id, ':_viewRoot:role-temp-form1:role-admin-link')]";
- public static final String LNK_USERMANG_MAIN = "//a[contains(@id,'user-temp-form1:assign-role-link')]";
- public static final String LNK_USERMANG_MAIN2 = "//a[contains(@id,'user-temp-form1:user-mgm-link')]";
- public static final String LNK_CREATE_USER = "//a[contains(@id,':user-form:create-user-link')]";
+ public final String LNK_ROLETAB = getProp(casePfx + "lnk.roletab", "//a[contains(@id,'user-temp-form:role-mgm-link')]");
- public static final String CHK_ROLE = "//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']";
+ public final String LNK_ROLEMAIN = getProp(casePfx + "lnk.rolemain", "//a[contains(@id, 'role-temp-form1:role-admin-link')]");
+ public final String LNK_USERMANG_MAIN = getProp(casePfx + "lnk.usermang.main", "//a[contains(@id,'user-temp-form1:assign-role-link')]");
+ public final String LNK_USERMANG_MAIN2 = getProp(casePfx + "lnk.usermang.main2", "//a[contains(@id,'user-temp-form1:user-mgm-link')]");
+ public final String LNK_CREATE_USER = getProp(casePfx + "lnk.create.user", "//a[contains(@id,':user-form:create-user-link')]");
- public static final long SEARCH_TIMEOUT = 5000;
+ public final String CHK_ROLE = getProp(casePfx + "chk.role", "//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']");
+ public final long SEARCH_TIMEOUT = 5000;
+
private String butDelUsr_id(String userName) {
String table = TBL_USERLIST;
int r = findTableRow(table, userName, 0);
@@ -424,12 +426,12 @@
}
@Test(enabled = true)
- public void testManyUsers(){
+ public void testManyUsers() {
for (int i = 0; i < 25; i++) {
createUser("user0" + i + "", "useruser", "user0" + i + "" + "@portal.com");
}
}
-
+
@Test(enabled = true, description = "Altering the number of rows in user search")
public void testSearchUserCount() {
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2009-02-23 09:38:02 UTC (rev 12858)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2009-02-23 10:53:13 UTC (rev 12859)
@@ -17,6 +17,7 @@
protected static int count;
protected static boolean screenshot = false;
protected static boolean htmlSource = false;
+ protected static String outputDir = "";
static {
String ss = System.getProperty("screenshot");
@@ -28,12 +29,17 @@
if ("true".equals(sh)) {
htmlSource = true;
}
+
+ String so = System.getProperty("output-dir");
+ if (so != null) {
+ outputDir = so;
+ }
}
@Override
public void onTestFailure(ITestResult tr) {
- String name = "F_" + tr.getName() + "-" + count;
+ String name = outputDir +"/"+ "F_" + tr.getName() + "-" + count;
if (htmlSource) {
try {
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-02-23 09:38:02 UTC (rev 12858)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-02-23 10:53:13 UTC (rev 12859)
@@ -32,7 +32,24 @@
private static final String LNK_ADMIN = "link=Admin";
private static final String LNK_LOGOUT = "link=Logout";
private static final String SEL_CMS_ACTION = "//div[@id='center']/div/div/div[1]/div/select";
-
+
+ public String caseIPfx = "iden.man.";
+ public final String LNK_ROLETAB = getProp(caseIPfx + "lnk.roletab", "//a[contains(@id,'user-temp-form:role-mgm-link')]");
+ public final String LNK_ROLEMAIN = getProp(caseIPfx + "lnk.rolemain", "//a[contains(@id, 'role-temp-form1:role-admin-link')]");
+ public final String LNK_ROLE_CREATE = getProp(caseIPfx + "lnk.role.create", "//a[contains(@id, 'create-role-form:create-role-link')]");
+ public final String INP_ROLEDISNAME = getProp(caseIPfx + "inp.roledisname", "//input[contains(@id,'create-role-form:roledisplayname')]");
+ public final String INP_ROLENAME = getProp(caseIPfx + "inp.rolename", "//input[contains(@id,'create-role-form:rolename')]");
+ public final String SUB_ROLE_CREATE = getProp(caseIPfx + "sub.role.create", "//input[contains(@id,'create-role-form:submit')]");
+ public final String SUB_ASSIGN_ROLE = getProp(caseIPfx + "sub.assign.role", "//input[contains(@id,'assign-roles-form:submit')]");
+ public final String CHK_ROLE = getProp(caseIPfx + "chk.role", "//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']");
+ public final String LNK_USERTAB = getProp(caseIPfx + "lnk.usertab", "//a[contains(@id,'role-temp-form:manage-users')]");
+ public final String LNK_USERMAIN = getProp(caseIPfx + "lnk.usermain", "//a[contains(@id,'user-temp-form1:user-adm-link')]");
+ public final String LNK_USERMANG_MAIN = getProp(caseIPfx + "lnk.usermang.main", "//a[contains(@id,'user-temp-form1:assign-role-link')]");
+ public final String SUB_SEARCH_USER = getProp(caseIPfx + "sub.search.user", "//input[contains(@id,'search-user-form:search')]");
+ public final String INP_SEARCH_USER = getProp(caseIPfx + "inp.search.user", "//input[contains(@id,'search-user-form:searchString')]");
+ public final String LNK_SEARCH_USER = getProp(caseIPfx + "lnk.search.user", "//a[contains(@id,'user-form:search-user-link')]");
+ public final String TBL_USERLIST = getProp(caseIPfx + "tbl.userlist", "//table[contains(@id,'search-user-form1:userlist')]");
+ public final String LNK_T_USRLIST_ROLES = getProp(caseIPfx + "lnk.t.usrlist.roles", "//a[contains(@id,''search-user-form1:userlist:{0}:assign-role-link'')]");
@AfterMethod(groups = { "log" })
public void logoutAfterTestIfPossible() {
@@ -81,15 +98,15 @@
selenium.click(LNK_MEMBERS);
selenium.waitForPageToLoad(PAGE_LOAD);
- clickIfVisible(IdentityAdminTestCase.LNK_ROLETAB);
- clickIfVisible(IdentityAdminTestCase.LNK_ROLEMAIN);
+ clickIfVisible(LNK_ROLETAB);
+ clickIfVisible(LNK_ROLEMAIN);
- selenium.click(IdentityAdminTestCase.LNK_ROLE_CREATE);
+ selenium.click(LNK_ROLE_CREATE);
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type(IdentityAdminTestCase.INP_ROLENAME, roleName);
- selenium.type(IdentityAdminTestCase.INP_ROLEDISNAME, roleDisplayName);
- selenium.click(IdentityAdminTestCase.SUB_ROLE_CREATE);
+ selenium.type(INP_ROLENAME, roleName);
+ selenium.type(INP_ROLEDISNAME, roleDisplayName);
+ selenium.click(SUB_ROLE_CREATE);
selenium.waitForPageToLoad(PAGE_LOAD);
logout();
}
@@ -338,11 +355,11 @@
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page.");
- final String CHECK_ROLE = MessageFormat.format(IdentityAdminTestCase.CHK_ROLE, role);
+ final String CHECK_ROLE = MessageFormat.format(CHK_ROLE, role);
if (!selenium.isChecked(CHECK_ROLE)) {
selenium.click(CHECK_ROLE);
- selenium.click(IdentityAdminTestCase.SUB_ASSIGN_ROLE);
+ selenium.click(SUB_ASSIGN_ROLE);
selenium.waitForPageToLoad(PAGE_LOAD);
}
searchUser(user, email);
@@ -362,11 +379,11 @@
Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page.");
// check the tempRole check box
- final String CHECK_ROLE = MessageFormat.format(IdentityAdminTestCase.CHK_ROLE, role);
+ final String CHECK_ROLE = MessageFormat.format(CHK_ROLE, role);
if (selenium.isChecked(CHECK_ROLE)) {
selenium.click(CHECK_ROLE);
- selenium.click(IdentityAdminTestCase.SUB_ASSIGN_ROLE);
+ selenium.click(SUB_ASSIGN_ROLE);
selenium.waitForPageToLoad(PAGE_LOAD);
}
searchUser(user, email);
@@ -386,15 +403,15 @@
selenium.click("link=Members");
selenium.waitForPageToLoad(PAGE_LOAD);
- clickIfVisible(IdentityAdminTestCase.LNK_USERTAB);
- clickIfVisible(IdentityAdminTestCase.LNK_USERMAIN);
- clickIfVisible(IdentityAdminTestCase.LNK_USERMANG_MAIN);
+ clickIfVisible(LNK_USERTAB);
+ clickIfVisible(LNK_USERMAIN);
+ clickIfVisible(LNK_USERMANG_MAIN);
- selenium.click(IdentityAdminTestCase.LNK_SEARCH_USER);
+ selenium.click(LNK_SEARCH_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type(IdentityAdminTestCase.INP_SEARCH_USER, username);
- selenium.click(IdentityAdminTestCase.SUB_SEARCH_USER);
+ selenium.type(INP_SEARCH_USER, username);
+ selenium.click(SUB_SEARCH_USER);
try {
Thread.sleep(5000);
@@ -408,8 +425,8 @@
}
private String butUsrRol_id(String userName) {
- String table = IdentityAdminTestCase.TBL_USERLIST;
+ String table = TBL_USERLIST;
int r = findTableRow(table, userName, 0);
- return MessageFormat.format(IdentityAdminTestCase.LNK_T_USRLIST_ROLES, r - 1);
+ return MessageFormat.format(LNK_T_USRLIST_ROLES, r - 1);
}
}
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-02-23 09:38:02 UTC (rev 12858)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-02-23 10:53:13 UTC (rev 12859)
@@ -1,3 +1,58 @@
+# IdentityAdminTestCase
+
+iden.man.sel.searchuser.limit=//select[contains(@id,'search-user-form:limit')]
+iden.man.sub.edit.prof=//input[contains(@id,'profile-form:submit')]
+iden.man.sub.pagin.left=//input[contains(@id,'search-user-form1:prev-page')]
+iden.man.sub.pagin.right=//input[contains(@id,'search-user-form1:next-page')]
+iden.man.sub.edit.user.email.cancel=//input[contains(@id,'profile-form:cancel')]
+iden.man.inp.edit.user.email=//input[contains(@id,'profile-form:email')]
+iden.man.sub.role.search.user=//input[contains(@id,'search-user-form:search') and @type='submit']
+iden.man.inp.role.search.user=//input[contains(@id,'search-user-form:searchString')]
+iden.man.sub.edit.role.submit=//input[contains(@id,'edit-role-link:submit')]
+iden.man.sub.edit.role.cancel=//input[contains(@id,'edit-role-link:cancel')]
+iden.man.inp.edit.role.name=//input[contains(@id,'edit-role-link:display-name')]
+iden.man.sub.pass.change.submit=//input[contains(@name,'change-pwd-form:j_id31')]
+iden.man.sub.pass.change.cancel=//input[contains(@id,'change-pwd-form:cancel')]
+iden.man.inp.pass.change.p2=//input[contains(@id,':change-pwd-form:passwordCheck')]
+iden.man.inp.pass.change.p1=//input[contains(@id,':change-pwd-form:password')]
+iden.man.lnk.change.pass=//a[contains(@id,':profile-form:change-pwd-adm-link')]
+iden.man.tbl.userlist=//table[contains(@id,'search-user-form1:userlist')]
+iden.man.lnk.t.usrlist.del=//a[contains(@id,''search-user-form1:userlist:{0}:delete-user-link'')]
+iden.man.lnk.t.usrlist.roles=//a[contains(@id,''search-user-form1:userlist:{0}:assign-role-link'')]
+iden.man.lnk.t.usrlist.dis=//a[contains(@id,''search-user-form1:userlist:{0}:enable-user-link'')]
+iden.man.lnk.t.usrlist.edit=//a[contains(@id,''search-user-form1:userlist:{0}:rename-link'')]
+iden.man.tbl.rolelist=//table[contains(@id,'roles-form:userlist')]
+iden.man.lnk.t.rollist.del=//a[contains(@id,''roles-form:userlist:{0}:delete-role-link'')]
+iden.man.lnk.t.rollist.members=//a[contains(@id,''roles-form:userlist:{0}:view-role-link'')]
+iden.man.lnk.t.rollist.edit=//a[contains(@id,''roles-form:userlist:{0}:edit-role-link'')]
+iden.man.tbl.rolemembers=//table[contains(@id,'role-members-form:role-data-table')]
+iden.man.sub.conf.create.user=//input[contains(@id,'confirm-form:admin')]
+iden.man.sub.delete.role=//input[contains(@id,'delete-role-form:confirm')]
+iden.man.sub.role.create=//input[contains(@id,'create-role-form:submit')]
+iden.man.inp.roledisname=//input[contains(@id,'create-role-form:roledisplayname')]
+iden.man.inp.rolename=//input[contains(@id,'create-role-form:rolename')]
+iden.man.lnk.role.create=//a[contains(@id, 'create-role-form:create-role-link')]
+iden.man.sub.del.user=//input[contains(@id,'delete-user-form:submit')]
+iden.man.sub.assign.role=//input[contains(@id,'assign-roles-form:submit')]
+iden.man.sub.user.role=//input[contains(@id,'register-role-form:submit')]
+iden.man.sub.create.user=//input[contains(@id,'register-form:submit')]
+iden.man.inp.password.chk=//input[contains(@id,'register-form:passwordCheck')]
+iden.man.inp.password=//input[contains(@id,'register-form:password')]
+iden.man.inp.useremail=//input[contains(@id,'register-form:email')]
+iden.man.inp.username=//input[contains(@id,'register-form:username')]
+iden.man.sub.search.user=//input[contains(@id,'search-user-form:search')]
+iden.man.inp.search.user=//input[contains(@id,'search-user-form:searchString')]
+iden.man.lnk.search.user=//a[contains(@id,'user-form:search-user-link')]
+iden.man.lnk.usertab=//a[contains(@id,'role-temp-form:manage-users')]
+iden.man.lnk.usermain=//a[contains(@id,'user-temp-form1:user-adm-link')]
+iden.man.lnk.roletab=//a[contains(@id,'user-temp-form:role-mgm-link')]
+iden.man.lnk.rolemain=//a[contains(@id, 'role-temp-form1:role-admin-link')]
+iden.man.lnk.usermang.main=//a[contains(@id,'user-temp-form1:assign-role-link')]
+iden.man.lnk.usermang.main2=//a[contains(@id,'user-temp-form1:user-mgm-link')]
+iden.man.lnk.create.user=//a[contains(@id,':user-form:create-user-link')]
+iden.man.chk.role=//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']
+
+
# EndToEndBeaPortlet
e2e.wsrp.inp.consumer.name=//input[contains(@id,'edit-cons-form:id')]
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12858 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-23 04:38:02 -0500 (Mon, 23 Feb 2009)
New Revision: 12858
Removed:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_ru.properties
Log:
JBPORTAL-2303: Dangling Resource Bundle
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_ru.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_ru.properties 2009-02-23 09:36:50 UTC (rev 12857)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_ru.properties 2009-02-23 09:38:02 UTC (rev 12858)
@@ -1,32 +0,0 @@
-################################################################################
-# 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. #
-################################################################################
-
-ACCOUNT_DISABLED=Your account is disabled
-ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=The user doesn't exist or the password is incorrect
-ACCOUNT_NOTASSIGNEDTOROLE=The user doesn't have the correct role
-
-LOGIN_TITLE=JBoss Portal Login
-LOGIN_USERNAME=Username
-LOGIN_PASSWORD=Password
-LOGIN_CANCEL=Cancel
-LOGIN_SUBMIT=Submit
\ No newline at end of file
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12857 - in branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf: data and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-23 04:36:50 -0500 (Mon, 23 Feb 2009)
New Revision: 12857
Added:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_pt.properties
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data/default-object.xml
Log:
JBPORTAL-2302: Support for Brazilian Portuguese (Core)
Added: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_pt.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_pt.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_pt.properties 2009-02-23 09:36:50 UTC (rev 12857)
@@ -0,0 +1,25 @@
+################################################################################
+# 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. #
+################################################################################
+
+org.jboss.portal.object.name.admin.default=Administra\u00e7\u00e3o
+org.jboss.portal.object.name.admin.Members=Membros
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data/default-object.xml 2009-02-23 09:30:22 UTC (rev 12856)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data/default-object.xml 2009-02-23 09:36:50 UTC (rev 12857)
@@ -149,7 +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>
- <properties>
+ <display-name xml:lang="pt">Home</display-name> <properties>
<property>
<name>order</name>
<value>1</value>
@@ -305,7 +305,7 @@
<display-name xml:lang="es">Home</display-name>
<display-name xml:lang="fr">Accueil</display-name>
<display-name xml:lang="ru">Домой</display-name>
- <properties>
+ <display-name xml:lang="pt">Home</display-name> <properties>
<property>
<name>order</name>
<value>1</value>
@@ -363,6 +363,7 @@
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
<supported-locale>ja</supported-locale>
+ <supported-locale>pt</supported-locale>
<resource-bundle>conf.bundles.Resource</resource-bundle>
<window>
@@ -390,6 +391,7 @@
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
<supported-locale>ja</supported-locale>
+ <supported-locale>pt</supported-locale>
<resource-bundle>conf.bundles.Resource</resource-bundle>
<window>
<window-name>IdentityAdminPortletWindow</window-name>
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12856 - branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-23 04:30:22 -0500 (Mon, 23 Feb 2009)
New Revision: 12856
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties
Log:
JBPORTAL-2322: Support for Brazilian Portuguese (CMS)
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties 2009-02-21 16:15:29 UTC (rev 12855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties 2009-02-23 09:30:22 UTC (rev 12856)
@@ -22,26 +22,27 @@
################################################################################
## CMS ADMIN PORTLET
-TITLE_HEAD=CMS Admin
-TITLE_BROWSE=Navegador de Diret�rios
+TITLE_HEAD=Administrador CMS
+TITLE_BROWSE=Navegador de Diret\u00f3rio
TITLE_FILEBROWSE=Navegador de Arquivos
-TITLE_DELETECONFIRM=Confirmar remo��o
-TITLE_CREATECOLLCONFIRM=Confirmar cria��o de diret�rio
-TITLE_COPYCONFIRM=Confirm Resource Copy
-TITLE_MOVECONFIRM=Confirm Resource Move
+TITLE_DELETECONFIRM=Confirmar Remo\u00e7\u00e3o
+TITLE_CREATECOLLCONFIRM=Confirmar Cria\u00e7\u00e3o de Diret\u00f3rio
+TITLE_COPYCONFIRM=Confirm Copiar Recursos
+TITLE_MOVECONFIRM=Confirm Mover Recursos
TITLE_VIEWFILE=Visualizando Propriedades de Arquivo
TITLE_EDIT=Editar Arquivo
TITLE_CREATE=Criar Arquivo
TITLE_UPLOAD=Enviar Arquivo
CMS_SEARCH=Pesquisar
-CMS_MENU=Menu de A��es
-CMS_ACTION=A��o
+CMS_SEARCHNORESULT=Nenhum resultado para essa pesquisa
+CMS_MENU=Menu de A\u00e7\u00e3o
+CMS_ACTION=A\u00e7\u00e3o
CMS_NAME=Nome
CMS_TYPE=Tipo
CMS_CREATED=Criado
CMS_MODIFIED=Modificado
-CMS_DESCRIPTION=Descri��o
+CMS_DESCRIPTION=Descri\u00e7\u00e3o
CMS_VIEW=Visualizar
CMS_COPY=Copiar
CMS_MOVE=Mover
@@ -55,35 +56,95 @@
CMS_UPLOAD=Enviar
CMS_MODIFY=Modificar
CMS_CREATEFOLDER=Criar Pasta
-CMS_CREATEFILE=Criar Diret�rio
+CMS_CREATEFILE=Criar Arquivo
CMS_UPLOADARCHIVE=Enviar Arquivo
-CMS_BACKTOBROWSER=Voltar ao Navegador de Diret�rios
+CMS_UPLOADARCHIVE_ASYNC=Processo Assincronamente
+CMS_BACKTOBROWSER=Voltar ao Navegador de Diret\u00f3rios
+CMS_TRANSFER=Importar/Exportar
+CMS_EXPORTARCHIVE=Exportar Pasta
+CMS_SECURE=Seguro
+CMS_PREVIEW=Visualizar
+CMS_GO=Ir
-CMS_CREATEFILEINDIR=Criando Arquivo em Diret�rio
+CMS_CREATEFILEINDIR=Criando Arquivo no Diret\u00f3rio
CMS_FILENAME=Nome do Arquivo
-CMS_TITLE=T�tulo
-CMS_LANGUAGE=L�ngua
+CMS_TITLE=T\u00edtulo
+CMS_LANGUAGE=Linguagem
-CMS_DELETEPATH=Confirmar remo��o de
-CMS_DELETEWARN1=ATEN��O\! Voc� n�o poderar desfazer estas altera��es\!
-CMS_DELETEWARN2=Voc� tem certeza que deseja remover\?
+CMS_DELETEPATH=Confirmar Remo\u00e7\u00e3o de
+CMS_DELETEWARN1=ATEN\u00c7\u00c3O! Voc\u00ea n\u00e3o poder\u00e1 desfazer estas altera\u00e7\u00f5es\!
+CMS_DELETEWARN2=Voc\u00ea tem certeza que deseja remover esse recurso\?
CMS_DESTINATION=Destino
CMS_SOURCE=Fonte
CMS_EDITING=Editando Arquivo
CMS_LIVE=Tornar \"Ativo\"
-CMS_VERSION=Vers�o
+CMS_VERSION=Vers\u00e3o
+CMS_WYSIWYG=Editor WYSIWYG
-CMS_LIVEVERSION=Vers�o \"Ativa\"
+CMS_LIVEVERSION=Vers\u00e3o Ativa
CMS_SIZE=Tamanho
-CMS_CONTENT_DIR=Content Directory
-CMS_CONTENT_DIR_USE=Use the directory tree to navigate the portal folder structure.
-CMS_MAIN_USE=Use the CMS Administration portlet to manage the content of your portal.
-CMS_MANAGE=Manage Content
+CMS_CONTENT_DIR=Conte\u00fado do Diret\u00f3rio
+CMS_CONTENT_DIR_USE=Use a \u00e1rvore de diret\u00f3rio para navegar na estrutura da pasta do portal
+CMS_MAIN_USE=Use o CMS de Administra\u00e7\u00e3o do portlet para gerenciar o conte\u00fado do seu portal
+CMS_MANAGE=Gerenciar Conte\u00fado
-CMS_CREATED_BY=Created By
-CMS_APPROVE=Approve
-CMS_DENY=Deny
-CMS_APPROVAL=Pending Items
+CMS_CREATED_BY=Criado Por
+CMS_APPROVE=Aprovado
+CMS_DENY=Negado
+CMS_APPROVAL=Itens Pendentes
+CMS_PATH=Local
+
+CMS_EMPTY_FOLDER=Esta pasta est\u00e1 vazia.
+
+CMS_ERROR_UPLOADARCHIVE_ASYNC=Um erro ocorreu enquanto processava seu arquivo. Por favor tente novamente com 'Processamento Ass\u00edncrono' ativado
+CMS_MSG_UPLOADARCHIVE_ASYNC=Seu arquivo foi aceito pelo processamento. O recurso aparecer\u00e1 em sua pasta uma vez que o processamento for finalizado
+
+CMS_REQUIRED=Requerido
+CMS_LINK_TO_RESOURCES=Links para recursos dentro deste portal devem ser absolutos. Por exemplo: Um link para a imagem localizada em default/images/back.gif deve ser digitado exatamente como mostrada aqui. N\u00e3o prefixe uma barra (/) para o caminho do recurso. Voc\u00ea pode verificar se o link est\u00e1 correto clicando no bot\u00e3o visualiza\u00e7\u00e3o no editor
+CMS_ERROR_PROCESSING=ERRO precessando o pedido de exporta\u00e7\u00e3o
+CMS_ERROR_EXPORT=Um erro ocorreu durante a Opera\u00e7\u00e3o de exporta\u00e7\u00e3o. Favor verificar se a pasta q est\u00e1 sendo exportada n\u00e3o est\u00e1 vazia
+CMS_YOUR_EXPORT_0=Sua exporta\u00e7\u00e3o de
+CMS_YOUR_EXPORT_1=est\u00e1 pronto para download
+CMS_CLICK_TO_DOWNLOAD=Clique para fazer o Download
+CMS_ROOT_FOLDER=Pasta Raiz
+CMS_MESSAGES=Mensagens
+CMS_HOME=Inicial
+CMS_ERROR=Erro
+CMS_PENDING_APPROVAL_QUEUE=Fila de Aprova\u00e7\u00e3o Pendente
+CMS_CONFIGURE_RESTRICTION=Configure as restri\u00e7\u00f5es de seguran\u00e7a no n\u00f3
+CMS_SELECT_ACTION=Selecione a A\u00e7\u00e3o...
+CMS_BROWSING=Navega\u00e7\u00e3o
+CMS_CONTENT_NOT_FOUND=Conte\u00fado n\u00e3o pode ser encontrado par o arquivo selecionado
+CMS_INTRODUCTION=Introdu\u00e7\u00e3o
+CMS_HELP=O Portlet CMS exibe o conte\u00fado do arquivo dentro da janela do portlet, ou, no caso de conte\u00fado bin\u00e1rio, totalmente fora da janela do portlet
+CMS_TO_MODIFY=Para modificar o comportamento deste portlet, por favor
+CMS_CLICK_HERE=clique aqui
+CMS_SELECT_ACTION=Selecione a A\u00e7\u00e3o
+
+CMS_QUERYERROR=A fila que voc\u00ea entrou n\u00e3o \u00e9 v\u00e1lida
+
+CMS_ADMIN_SET_READ_PERMISSIONS=Definir Permiss\u00f5es de Leitura
+CMS_ADMIN_SET_WRITE_PERMISSIONS=Definir Permiss\u00f5es de Escrita
+CMS_ADMIN_SET_MANAGE_PERMISSIONS=Definir Permiss\u00f5es de Ger\u00eancia
+CMS_ADMIN_SELECT_ROLES=Selecione as regras que tem acesso a este n\u00f3.
+CMS_ADMIN_SELECT_USERS=Selecione os usu\u00e1rios que tem acesso a este n\u00f3.
+CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=Voc\u00ea pode selecionar m\u00faltiplas regras usando CTRL+clique (CMD+clique em Mac) nos nomes das regras.
+CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=Voc\u00ea pode selecionar m\u00faltiplos usu\u00e1rios usando CTRL+clique (CMD+clique em Mac) nos nomes de usu\u00e1rios.
+
+CMS_ACCESS_DENIED=Acesso Negado
+CMS_ACCESS_DENIED_DESCRIPTION=Voc\u00ea n\u00e3o est\u00e1 permitido a acessar este recurso
+CMS_ACCESS_DENIED_DESCRIPTION_PATH=Voc\u00ea n\u00e3o est\u00e1 permitido a acessar o recurso
+
+CMS_MISSING_DOCUMENT=404 - P\u00e1gina N\u00e3o Encontrada
+CMS_MISSING_DOCUMENT_DESCRIPTION=O documento que voc\u00ea tentou acessar n\u00e3o est\u00e1 dispon\u00edvel
+
+CMS_FILENAME_INVALID=Nome de arquivo inv\u00e1lido. N\u00e3o deve conter caracteres ilegais tais como '.', '/', ':', '[', ']', '*', ''', '"', '|' ou caracter com espa\u00e7o em branco.
+CMS_FOLDERNAME_INVALID=Nome de pasta inv\u00e1lida. N\u00e3o deve conter caracteres ilegais tais como '.', '/', ':', '[', ']', '*', ''', '"', '|' ou caracter com espa\u00e7o em branco.
+
+CMS_MSG_DESTINATION_ALREADY_EXISTS=O comando n\u00e3o foi realizado porque o destino ja existe
+CMS_CANT_MOVE_SAME_DESTINATION=Voc\u00ea n\u00e3o pode mover a pasta para o mesmo local
+
+CMS_DATE_PATTERN=dd/MM/yy
\ No newline at end of file
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12855 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/WEB-INF/classes and 3 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-21 11:15:29 -0500 (Sat, 21 Feb 2009)
New Revision: 12855
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties
Log:
- JBPORTAL-2317:
+ Updated faces-config.xml to reflect changes in code (added beanContext where needed,
plus renamed pageContainer to renamedObject)
+ Added h:message tags where appropriate and fixed styles.
+ Updated Resource files.
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-02-21 16:12:51 UTC (rev 12854)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-02-21 16:15:29 UTC (rev 12855)
@@ -324,7 +324,7 @@
COORDINATION_PARAMETER=parameter binding
COORDINATION_ALIAS=alias binding
-INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\' or '%5c'
+INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\\' or '%5c'
NO_SELECTED_PORTLET_ERROR=No portlet was selected!
DUPLICATE_ERROR=A(n) {1} named ''{0}'' already exists!
bean_support_unexpected_error=Unexpected error:
@@ -333,3 +333,6 @@
INSTANCE_TYPE=instance
PAGE_TYPE=page
PORTAL_TYPE=portal
+DISPLAY_NAME_TYPE=display name
+PROPERTY_TYPE=property
+PORTAL_OBJECT_TYPE=portal object
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-02-21 16:12:51 UTC (rev 12854)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-02-21 16:15:29 UTC (rev 12855)
@@ -325,6 +325,11 @@
<property-name>listener</property-name>
<value>#{sessionScope.dashboard}</value>
</managed-property>
+ <managed-property>
+ <property-name>beanContext</property-name>
+ <property-class>org.jboss.portal.faces.gui.BeanContext</property-class>
+ <value>#{beanContext}</value>
+ </managed-property>
</managed-bean>
<managed-bean>
@@ -332,7 +337,7 @@
<managed-bean-class>org.jboss.portal.core.admin.ui.actions.RenameAction</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
<managed-property>
- <property-name>pageContainer</property-name>
+ <property-name>renamedObject</property-name>
<value>#{portalobjectmgr.selectedObject}</value>
</managed-property>
<managed-property>
@@ -343,6 +348,11 @@
<property-name>domainConfigurator</property-name>
<value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value>
</managed-property>
+ <managed-property>
+ <property-name>beanContext</property-name>
+ <property-class>org.jboss.portal.faces.gui.BeanContext</property-class>
+ <value>#{beanContext}</value>
+ </managed-property>
</managed-bean>
<managed-bean>
@@ -380,7 +390,7 @@
<managed-bean-class>org.jboss.portal.core.admin.ui.actions.RenameAction</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
<managed-property>
- <property-name>pageContainer</property-name>
+ <property-name>renamedObject</property-name>
<value>#{dashboard.selectedPage}</value>
</managed-property>
<managed-property>
@@ -391,6 +401,11 @@
<property-name>domainConfigurator</property-name>
<value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value>
</managed-property>
+ <managed-property>
+ <property-name>beanContext</property-name>
+ <property-class>org.jboss.portal.faces.gui.BeanContext</property-class>
+ <value>#{beanContext}</value>
+ </managed-property>
</managed-bean>
<!-- Constants -->
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-02-21 16:12:51 UTC (rev 12854)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-02-21 16:15:29 UTC (rev 12855)
@@ -52,6 +52,7 @@
<td>
<h:inputText id="property" styleClass="portlet-form-input-field"
value="#{properties.action.otherPropertyName}"/>
+ <h:message for="property" errorClass="portlet-msg-error"/>
</td>
</tr>
</tbody>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2009-02-21 16:12:51 UTC (rev 12854)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2009-02-21 16:15:29 UTC (rev 12855)
@@ -7,13 +7,11 @@
<ui:composition template="objectTemplate.xhtml">
<ui:param name="portalObjectScreen" value="#{bundle.RENAME}"/>
<ui:define name="content">
- <h3>#{bundle.RENAME} #{coordinationManager.selectedType}</h3>
+ <h3 class="sectionTitle">#{bundle.RENAME} #{coordinationManager.selectedType}</h3>
<h:form id="renameForm">
- <h:message for="newName"/>
-
<p>#{bundle.RENAME_THE} <span class="objectName">#{coordinationManager.selectedName}</span>
#{coordinationManager.selectedType} #{bundle.TO}:
- <h:inputText id="newName" value="#{coordinationManager.newName}"/>
+ <h:inputText id="newName" value="#{coordinationManager.newName}"/> <h:message for="newName" errorClass="portlet-msg-error"/>
<h:commandButton value="#{bundle.RENAME}" action="#{coordinationManager.renameSelected}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
<h:commandButton value="#{bundle.COMMON_CANCEL}" action="editCoordination"
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2009-02-21 16:12:51 UTC (rev 12854)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2009-02-21 16:15:29 UTC (rev 12855)
@@ -7,13 +7,11 @@
<ui:composition template="objectTemplate.xhtml">
<ui:param name="portalObjectScreen" value="#{bundle.RENAME}"/>
<ui:define name="content">
- <h3>#{bundle.RENAME} #{portalobjectmgr.selectedObjectType}</h3>
+ <h3 class="sectionTitle">#{bundle.RENAME} #{portalobjectmgr.selectedObjectType}</h3>
<h:form id="renameForm">
- <h:message for="newName"/>
-
<p>#{bundle.RENAME_THE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
#{portalobjectmgr.selectedObjectType} #{bundle.TO}:
- <h:inputText id="newName" value="#{renameAction.newName}"/>
+ <h:inputText id="newName" value="#{renameAction.newName}"/> <h:message for="newName" errorClass="portlet-msg-error"/>
<h:commandButton id="rename" value="#{bundle.RENAME}" action="#{renameAction.execute}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
<h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="objects"
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-02-21 16:12:51 UTC (rev 12854)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-02-21 16:15:29 UTC (rev 12855)
@@ -137,6 +137,7 @@
bean_support_unexpected_error = An unexpected error occured:
bean_support_cause = Cause:
+CONSUMER_TYPE = Consumer
# ConsumerBean
bean_consumer_cannot_find_consumer = Couldn''t find consumer ''{0}''!
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-02-21 16:12:51 UTC (rev 12854)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-02-21 16:15:29 UTC (rev 12855)
@@ -144,4 +144,5 @@
registration_property_status_unchecked_value=Status ind\u00e9termin\u00e9
registration_property_status_valid=Valide
org.jboss.portal.object.name.admin.WSRP=WSRP
-consumers_table_reload=Recharger consommateurs
\ No newline at end of file
+consumers_table_reload=Recharger consommateurs
+CONSUMER_TYPE=Consommateur
\ No newline at end of file
17 years, 2 months
- 1
- 0