JBoss Portal SVN: r12081 - branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-16 22:08:44 -0400 (Thu, 16 Oct 2008)
New Revision: 12081
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java
Log:
- Added debugging output.
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java 2008-10-17 02:05:06 UTC (rev 12080)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPPortletURL.java 2008-10-17 02:08:44 UTC (rev 12081)
@@ -30,6 +30,7 @@
import org.jboss.portal.common.text.FastURLDecoder;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.portlet.ActionURL;
+import org.jboss.portal.portlet.ParametersStateString;
import org.jboss.portal.portlet.PortletURL;
import org.jboss.portal.portlet.RenderURL;
import org.jboss.portal.portlet.ResourceURL;
@@ -462,6 +463,17 @@
}
params.put(name, value);
+
+ // unserialize opaque state for debugging purpose
+ if (log.isTraceEnabled())
+ {
+ if (WSRPRewritingConstants.INTERACTION_STATE.equals(name) || WSRPRewritingConstants.NAVIGATIONAL_STATE.equals(name))
+ {
+ StateString clear = ParametersStateString.create(value);
+ log.trace(name + " value:" + clear);
+ }
+ }
+
encodedURL = encodedURL.substring(endParamIndex + PARAM_SEPARATOR.length());
}
return params;
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r12080 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-16 22:05:06 -0400 (Thu, 16 Oct 2008)
New Revision: 12080
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java
Log:
- If a window id has already been through the namespacing process, do not re-add prefix and suffix
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2008-10-17 01:05:49 UTC (rev 12079)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2008-10-17 02:05:06 UTC (rev 12080)
@@ -22,13 +22,10 @@
******************************************************************************/
package org.jboss.portal.portlet.impl.jsr168;
-import org.jboss.portal.portlet.impl.jsr168.api.PortletRequestImpl;
-
import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
import javax.portlet.PortletResponse;
+import javax.portlet.WindowState;
import javax.portlet.filter.PortletRequestWrapper;
import javax.portlet.filter.PortletResponseWrapper;
@@ -104,25 +101,32 @@
*/
public static String generateNamespaceFrom(String windowId)
{
- StringBuffer tmp = new StringBuffer(PREFIX.length() + windowId.length() * 2);
- tmp.append(PREFIX);
- for (int i = 0; i < windowId.length(); i++)
+ if (windowId.startsWith(PREFIX) && windowId.endsWith(SUFFIX))
{
- char c = windowId.charAt(i);
- int charVal = c;
- if ((charVal >= 65 && charVal <= 90) || (charVal >= 97 && charVal <= 122) || (charVal >=48 && charVal <= 57) || (charVal == 95) || charVal == 36)
+ // we already have a namespaced window id
+ return windowId;
+ }
+ else
+ {
+ StringBuffer tmp = new StringBuffer(PREFIX.length() + windowId.length() * 2);
+ tmp.append(PREFIX);
+ for (int i = 0; i < windowId.length(); i++)
{
- tmp.append(c);
+ char c = windowId.charAt(i);
+ if (((int)c >= 65 && (int)c <= 90) || ((int)c >= 97 && (int)c <= 122) || ((int)c >= 48 && (int)c <= 57) || ((int)c == 95) || (int)c == 36)
+ {
+ tmp.append(c);
+ }
+ else
+ {
+ tmp.append('_');
+ tmp.append(Character.forDigit((((int)c) & 0XF0) >> 4, 16));
+ tmp.append(Character.forDigit((((int)c) & 0X0F), 16));
+ }
}
- else
- {
- tmp.append('_');
- tmp.append(Character.forDigit((((int)c) & 0XF0) >> 4, 16));
- tmp.append(Character.forDigit((((int)c) & 0X0F), 16));
- }
+ tmp.append(SUFFIX);
+ return tmp.toString();
}
- tmp.append(SUFFIX);
- return tmp.toString();
}
public static <U extends PortletRequest> U unwrap(PortletRequest wrapped, Class<U> unwrapped)
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r12079 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: bin/portal-admin-war/img/jbp-icon-set and 1 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-10-16 21:05:49 -0400 (Thu, 16 Oct 2008)
New Revision: 12079
Added:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_param.gif
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
Log:
JBPORTAL-1919 alias and parameter binding ui
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css 2008-10-16 22:29:50 UTC (rev 12078)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css 2008-10-17 01:05:49 UTC (rev 12079)
@@ -55,6 +55,16 @@
width: 65.9%;
}
+.auto-width {
+ width: auto;
+ padding: 0 7px 0 0;
+}
+
+.ten-percent-width {
+ width: 10%;
+}
+
+
.third-width-pad5 {
width: 32.5%;
padding: 5px;
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-10-16 22:29:50 UTC (rev 12078)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-10-17 01:05:49 UTC (rev 12079)
@@ -723,6 +723,12 @@
padding: 0 0 0 10px;
}
+.paramBinding-step2 {
+ border-left: 2px solid #ececec;
+ padding: 0 0 0 10px;
+}
+
+
ul.coord-nav {
padding: 0;
margin: 0;
@@ -739,6 +745,29 @@
font-weight: bold;
}
+ul.paramList {
+ margin: 0;
+ padding: 0;
+}
+
+ul.paramList li {
+ list-style-image: url( "../img/jbp-icon-set/window_param.gif" );
+ list-style-type: none;
+ list-style-position: inside;
+ padding: 3px 0 0 5px;
+}
+
+div.paramList-header {
+ font-weight: bold;
+ font-size: 1em;
+ border-bottom: 1px solid #ececec;
+ background-image: url("../img/jbp-icon-set/window.gif");
+ background-repeat: no-repeat;
+ background-position: top left;
+ padding: 0 0 0 22px;
+ margin: 4px 0 0 0;
+}
+
/*--------------------------- Coordination admin end */
h3.blue {
padding: 2px 2px 2px 5px;
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_param.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_param.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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 2008-10-16 22:29:50 UTC (rev 12078)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-10-17 01:05:49 UTC (rev 12079)
@@ -72,9 +72,9 @@
<h:form rendered="#{!empty aliasManager.displayAliasBindings}">
<div class="float-left full-width">
<h:dataTable var="binding" value="#{aliasManager.displayAliasBindings}"
- rendered="true" styleClass="objectList datatable"
+ rendered="true" styleClass="objectList datatable full-width"
rowClasses="portlet-section-body,portlet-section-alternate-blue"
- columnClasses="objectNameColumn"
+ columnClasses="half-width"
headerClass="portlet-section-header">
<h:column>
<f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_NAME}</f:facet>
@@ -130,8 +130,8 @@
<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}">
- <div class="float-left quarter-width">
- #{bundle.COORDINATION_PARAMETER_CREATE_STEP1}
+ <div class="float-left tenpx-right">
+ <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP1}</h4>
<h:selectManyListbox id="parameterWindowPair" size="5" value="#{parameterManager.selectedParameterWindowPairs}"
immediate="true" onchange="this.form.submit()">
<f:selectItems value="#{parameterManager.availableParameterWindowPairs}"/>
@@ -139,13 +139,17 @@
</div>
<h:panelGroup rendered="#{!empty parameterManager.selectedParameterWindowPairs}">
- <div class="float-left quarter-width">
- #{bundle.COORDINATION_PARAMETER_CREATE_STEP2}
- <h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/>
- <h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}"
- action="#{parameterManager.create}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{parameterManager.cancel}"
- styleClass="portlet-form-button"/>
+ <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:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}"
+ action="#{parameterManager.create}" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{parameterManager.cancel}"
+ styleClass="portlet-form-button"/>
+ </span>
+ </div>
</div>
</h:panelGroup>
@@ -158,27 +162,36 @@
<h:outputText value="#{bundle.COORDINATION_PARAMETER_EXISTING_NONE}" rendered="#{empty parameterManager.displayParameterBindings}"/>
<h:form rendered="#{!empty parameterManager.displayParameterBindings}">
<h:dataTable var="binding" value="#{parameterManager.displayParameterBindings}"
- rendered="true" styleClass="objectList datatable"
+ rendered="true" styleClass="objectList datatable full-width"
rowClasses="portlet-section-body,portlet-section-alternate-blue"
- columnClasses="objectNameColumn"
+ columnClasses="ten-percent-width,half-width,quarter-width"
headerClass="portlet-section-header">
<h:column>
<f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_NAME}</f:facet>
- #{binding.name}
+ <h4>#{binding.name}</h4>
</h:column>
<h:column>
<f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_PAIRS}</f:facet>
- <ul>
+ <div class="full-width">
<ui:repeat var="pair" value="#{binding.parameterWindowPairs}">
- <li>
- #{pair.name}#{pair.separator}
- <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">
- <f:param name="id" value="#{pair.window.id}"/>
- #{pair.window.name}
- </h:commandLink>
- </li>
+ <div class="float-left pad5">
+ <div class="paramList-header">#{pair.window.name}</div>
+ <ul class="paramList">
+ <c:set var="pairname" value="#{fn:split(pair.name, ';')}" />
+ <ui:repeat var="name" value="#{pairname}">
+ <li>#{name}</li>
+ </ui:repeat>
+ </ul>
+ <ui:remove>
+ <!--<h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">-->
+ <!--<f:param name="id" value="#{pair.window.id}"/>-->
+ <!--#{pair.window.name}-->
+ <!--</h:commandLink>-->
+ </ui:remove>
+ </div>
</ui:repeat>
- </ul>
+ </div>
+
</h:column>
<h:column>
<f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_ACTIONS}</f:facet>
@@ -219,7 +232,7 @@
<h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/>
<h:form rendered="#{!empty eventManager.sourceEvents}">
<h:panelGroup>
- #{bundle.COORDINATION_EVENT_CREATE_STEP1}
+ <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP1}</h4>
<h:selectOneListbox id="sourceEvent" size="5" value="#{eventManager.selectedSourceEvent}" immediate="true"
onchange="this.form.submit()">
<f:selectItems value="#{eventManager.sourceEvents}"/>
@@ -227,7 +240,7 @@
</h:panelGroup>
<h:panelGroup rendered="#{!empty eventManager.selectedSourceEvent}">
- #{eventManager.step2Message} <!-- this uses bundle.COORDINATION_EVENT_CREATE_STEP2 -->
+ <h4>#{eventManager.step2Message}</h4> <!-- this uses bundle.COORDINATION_EVENT_CREATE_STEP2 -->
<h:selectManyListbox id="sourceWindows" size="5" value="#{eventManager.selectedSourceWindows}" immediate="true"
onchange="this.form.submit()">
<f:selectItems value="#{eventManager.sourceWindows}"/>
@@ -235,7 +248,7 @@
</h:panelGroup>
<h:panelGroup rendered="#{!empty eventManager.selectedSourceWindows}">
- #{bundle.COORDINATION_EVENT_CREATE_STEP3}
+ <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP3}</h4>
<h:selectOneListbox id="destEvent" size="5" value="#{eventManager.selectedDestinationEvent}" immediate="true"
onchange="this.form.submit()">
<f:selectItems value="#{eventManager.destinationEvents}"/>
@@ -243,7 +256,7 @@
</h:panelGroup>
<h:panelGroup rendered="#{!empty eventManager.selectedDestinationEvent}">
- #{eventManager.step4Message} <!-- this uses bundle.COORDINATION_EVENT_CREATE_STEP4 -->
+ <h4>#{eventManager.step4Message}</h4> <!-- this uses bundle.COORDINATION_EVENT_CREATE_STEP4 -->
<h:selectManyListbox id="destWindows" size="5" value="#{eventManager.selectedDestinationWindows}" immediate="true"
onchange="this.form.submit()">
<f:selectItems value="#{eventManager.destinationWindows}"/>
@@ -251,7 +264,7 @@
</h:panelGroup>
<h:panelGroup rendered="#{!empty eventManager.selectedDestinationWindows}">
- #{bundle.COORDINATION_EVENT_CREATE_STEP5}
+ <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP5}</h4>
<h:inputText id="wiringName" value="#{eventManager.wiringName}"/>
<h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventManager.create}"
styleClass="portlet-form-button"/>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r12078 - modules/cms/trunk/cms-jackrabbit.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-10-16 18:29:50 -0400 (Thu, 16 Oct 2008)
New Revision: 12078
Modified:
modules/cms/trunk/cms-jackrabbit/pom.xml
Log:
adding some profile to run test against many db in lab.
Use mvn test -Djdbc-drivers-repo -Pdb-test-drivers
Modified: modules/cms/trunk/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/pom.xml 2008-10-16 13:48:38 UTC (rev 12077)
+++ modules/cms/trunk/cms-jackrabbit/pom.xml 2008-10-16 22:29:50 UTC (rev 12078)
@@ -1,298 +1,334 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.portal.cms</groupId>
- <artifactId>module-parent</artifactId>
- <relativePath>../build/pom.xml</relativePath>
- <version>trunk-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cms-jackrabbit</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Portal CMS based on JackRabbit 1.4</name>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.portal.cms</groupId>
+ <artifactId>module-parent</artifactId>
+ <relativePath>../build/pom.xml</relativePath>
+ <version>trunk-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cms-jackrabbit</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Portal CMS based on JackRabbit 1.4</name>
- <dependencies>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- </dependency>
- <dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.portal.common</groupId>
- <artifactId>common-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.portal.identity</groupId>
- <artifactId>identity-identity</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-jdk</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
-
- <!-- local dependencies -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.portal.common</groupId>
- <artifactId>common-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.portal.identity</groupId>
- <artifactId>identity-identity</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-jdk</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.portal.core</groupId>
- <artifactId>core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.portal.core</groupId>
- <artifactId>security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.portal.core</groupId>
- <artifactId>search</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.portal.core</groupId>
- <artifactId>jems</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.portal.core</groupId>
- <artifactId>workflow</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.portal.core</groupId>
- <artifactId>server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jbpm</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossha</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.common</groupId>
+ <artifactId>common-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.identity</groupId>
+ <artifactId>identity-identity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-jdk</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </dependency>
- <!--TEST SCOPE-->
- <dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>opends</artifactId>
- <type>sar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-mc</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling-ant</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>portal-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.jbossas.core-libs</groupId>
- <artifactId>jboss-local-jdbc</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.jbossas.core-libs</groupId>
- <artifactId>jboss-common-jdbc-wrapper</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>bsh</groupId>
- <artifactId>bsh</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- local dependencies -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.common</groupId>
+ <artifactId>common-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.identity</groupId>
+ <artifactId>identity-identity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-jdk</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.core</groupId>
+ <artifactId>core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.core</groupId>
+ <artifactId>security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.core</groupId>
+ <artifactId>search</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.core</groupId>
+ <artifactId>jems</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.core</groupId>
+ <artifactId>workflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.core</groupId>
+ <artifactId>server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-jpdl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbossha</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss</artifactId>
+ </dependency>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.13</version>
- <dependencies>
- <dependency>
- <groupId>cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <version>0.9-portal</version>
- </dependency>
- <dependency>
- <groupId>cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>0.9-portal</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>test</id>
- <phase>test</phase>
- <configuration>
- <tasks>
+ <!--TEST SCOPE-->
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>opends</artifactId>
+ <type>sar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-mc</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-tooling-ant</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>portal-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossas.core-libs</groupId>
+ <artifactId>jboss-local-jdbc</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossas.core-libs</groupId>
+ <artifactId>jboss-common-jdbc-wrapper</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>bsh</groupId>
+ <artifactId>bsh</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <property name="compile_classpath"
- refid="maven.compile.classpath" />
- <property name="runtime_classpath"
- refid="maven.runtime.classpath" />
- <property name="test_classpath" refid="maven.test.classpath" />
- <property name="plugin_classpath" refid="maven.plugin.classpath" />
+ <!-- run tests against different databases in qa lab -->
+ <profiles>
+ <profile>
+ <id>db-test-drivers</id>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.0.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.1-407.jdbc3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <version>10.0.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
- <ant antfile="${basedir}/build.xml">
- <target name="test" />
- </ant>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>
+ org.jvnet.maven-antrun-extended-plugin
+ </groupId>
+ <artifactId>maven-antrun-extended-plugin</artifactId>
+ <version>1.13</version>
+ <dependencies>
+ <dependency>
+ <groupId>cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.9-portal</version>
+ </dependency>
+ <dependency>
+ <groupId>cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.9-portal</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>testSuiteCleanupBeforeCompile</id>
- <phase>compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete dir="repotest" />
- <delete dir="repotest-hsqldb" />
- <delete file="test.properties" />
- <delete file="test.script" />
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>testCleanupAfterTest</id>
- <phase>test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete dir="repotest" />
- <delete dir="repotest-hsqldb" />
- <delete file="test.properties" />
- <delete file="test.script" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgument>-nowarn</compilerArgument>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <property name="compile_classpath"
+ refid="maven.compile.classpath" />
+ <property name="runtime_classpath"
+ refid="maven.runtime.classpath" />
+ <property name="test_classpath"
+ refid="maven.test.classpath" />
+ <property name="plugin_classpath"
+ refid="maven.plugin.classpath" />
+
+ <ant antfile="${basedir}/build.xml">
+ <target name="test" />
+ </ant>
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>testSuiteCleanupBeforeCompile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete dir="repotest" />
+ <delete dir="repotest-hsqldb" />
+ <delete file="test.properties" />
+ <delete file="test.script" />
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>testCleanupAfterTest</id>
+ <phase>test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete dir="repotest" />
+ <delete dir="repotest-hsqldb" />
+ <delete file="test.properties" />
+ <delete file="test.script" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgument>-nowarn</compilerArgument>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r12077 - modules/portlet/trunk/build.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2008-10-16 09:48:38 -0400 (Thu, 16 Oct 2008)
New Revision: 12077
Modified:
modules/portlet/trunk/build/pom.xml
Log:
Update common dependency version.
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- modules/portlet/trunk/build/pom.xml 2008-10-15 21:12:37 UTC (rev 12076)
+++ modules/portlet/trunk/build/pom.xml 2008-10-16 13:48:38 UTC (rev 12077)
@@ -33,7 +33,7 @@
<version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.jbossxb>2.0.0.CR8</version.jbossxb>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
- <version.jboss.portal.common>1.2.1</version.jboss.portal.common>
+ <version.jboss.portal.common>1.2-SNAPSHOT</version.jboss.portal.common>
<version.jboss.portal.web>1.2.1</version.jboss.portal.web>
<version.jboss.unit>1.2.1</version.jboss.unit>
<version.log4j>1.2.14</version.log4j>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r12076 - 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: wesleyhales
Date: 2008-10-15 17:12:37 -0400 (Wed, 15 Oct 2008)
New Revision: 12076
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
Log:
JBPORTAL-1919 wip
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css 2008-10-15 18:33:01 UTC (rev 12075)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css 2008-10-15 21:12:37 UTC (rev 12076)
@@ -116,3 +116,7 @@
position:relative;
}
+.hidden {
+ display: none;
+}
+
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-10-15 18:33:01 UTC (rev 12075)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-10-15 21:12:37 UTC (rev 12076)
@@ -708,11 +708,37 @@
list-style-position: inside;
}
+div.bindingList-header {
+ font-weight: bold;
+ font-size: 1em;
+ border-bottom: 1px solid #ececec;
+}
+
+div.bindingListContainer {
+ padding: 3px;
+}
+
.aliasBinding-step2 {
border-left: 2px solid #ececec;
padding: 0 0 0 10px;
}
+ul.coord-nav {
+ padding: 0;
+ margin: 0;
+}
+
+ul.coord-nav li {
+ list-style: none;
+ display: inline;
+ padding: 0 10px 0 0;
+}
+
+ul.coord-nav li a{
+ font-size: 1em;
+ font-weight: bold;
+}
+
/*--------------------------- Coordination admin end */
h3.blue {
padding: 2px 2px 2px 5px;
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 2008-10-15 18:33:01 UTC (rev 12075)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-10-15 21:12:37 UTC (rev 12076)
@@ -10,11 +10,27 @@
xmlns:rich="http://richfaces.org/rich">
<ui:param name="portalObjectScreen" value="#{bundle.COORDINATION_COORDINATION}"/>
<ui:define name="content">
+ <script type="text/javascript">
+ <!--
+ function toggle_visibility(id) {
+ var e = document.getElementById(id);
+ if(e.style.display != 'none')
+ e.style.display = 'none';
+ else
+ e.style.display = '';
+ }
+ //-->
+ </script>
+ <br/>
+ <ul class="clear coord-nav">
+ <li><a href="javascript:toggle_visibility('aliasBindings');toggle_visibility('parameterBindings');toggle_visibility('eventWirings');void(0);">Expand/Collapse All</a></li>
+ </ul>
<div class="tenpx-top-bottom">
- <h2 class="portlet-area-header">#{bundle.COORDINATION_ALIAS_BINDINGS}</h2>
+ <h2 class="portlet-area-header" onclick="toggle_visibility('aliasBindings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_ALIAS_BINDINGS}"/>#{bundle.COORDINATION_ALIAS_BINDINGS}</h2>
<!-- Create alias binding -->
+ <div id="aliasBindings">
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_CREATE}</h3>
<h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" rendered="#{empty aliasManager.availableRenderParameters}"/>
<h:form rendered="#{!empty aliasManager.availableRenderParameters}">
@@ -62,16 +78,20 @@
headerClass="portlet-section-header">
<h:column>
<f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_NAME}</f:facet>
- #{binding.name}
+ <div class="bindingListContainer">
+ <div class="bindingList-header">#{binding.name}</div>
+ <ul class="bindingList">
+ <ui:repeat var="qname" value="#{binding.names}">
+ <li>#{qname}</li>
+ </ui:repeat>
+ </ul>
+ </div>
</h:column>
+ <ui:remove>
<h:column>
<f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ORIGINAL}</f:facet>
- <ul>
- <ui:repeat var="qname" value="#{binding.names}">
- <li>#{qname}</li>
- </ui:repeat>
- </ul>
</h:column>
+ </ui:remove>
<h:column>
<f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ACTIONS}</f:facet>
<h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
@@ -92,10 +112,11 @@
<br class="clear"/>
</h:form>
</div>
+ </div>
<div class="tenpx-top-bottom">
- <h2 class="portlet-area-header">#{bundle.COORDINATION_PARAMETER_BINDINGS}</h2>
-
+ <h2 class="portlet-area-header" onclick="toggle_visibility('parameterBindings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_PARAMETER_BINDINGS}"/>#{bundle.COORDINATION_PARAMETER_BINDINGS}</h2>
+ <div id="parameterBindings">
<h:form>
<h:selectBooleanCheckbox id="useExplicitBinding" value="#{coordinationManager.explicitParametersUsed}"
onchange="this.form.submit()" immediate="true"/>
@@ -179,11 +200,13 @@
</div>
</h:panelGroup>
<br class="clear"/>
+ </div>
</div>
<!-- Event wirings -->
- <h2 class="portlet-area-header">#{bundle.COORDINATION_EVENT_WIRINGS}</h2>
+ <h2 class="portlet-area-header" onclick="toggle_visibility('eventWirings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_EVENT_WIRINGS}"/>#{bundle.COORDINATION_EVENT_WIRINGS}</h2>
+ <div id="eventWirings">
<h:form>
<h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationManager.explicitEventsUsed}"
onchange="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE}
@@ -328,5 +351,7 @@
</h:dataTable>
</h:form>
</h:panelGroup>
+ </div>
+
</ui:define>
</ui:composition>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r12075 - branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-10-15 14:33:01 -0400 (Wed, 15 Oct 2008)
New Revision: 12075
Added:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/binding-arrow.gif
Log:
JBPORTAL-1919 continue work
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/binding-arrow.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/binding-arrow.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r12074 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/jsf and 2 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-10-15 14:32:23 -0400 (Wed, 15 Oct 2008)
New Revision: 12074
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp
Log:
JBPORTAL-1919 and cleanup some on refreshRepeat demo
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css 2008-10-15 18:07:27 UTC (rev 12073)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css 2008-10-15 18:32:23 UTC (rev 12074)
@@ -69,6 +69,14 @@
margin: 10px 0 10px 0;
}
+.tenpx-right {
+ margin: 0 10px 0 0;
+}
+
+.tenpx-left {
+ margin: 0 0 0 10px;
+}
+
.clear {
clear: both;
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-10-15 18:07:27 UTC (rev 12073)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-10-15 18:32:23 UTC (rev 12074)
@@ -692,10 +692,36 @@
.details-body {
padding: 15px 0 0 0;
}
+/*--------------------------- Instance Meta Data end*/
+/*--------------------------- Coordination admin */
+
+ul.bindingList {
+ margin: 0;
+ padding: 0;
+}
+
+ul.bindingList li {
+ list-style-image: url( "/portal-admin/img/binding-arrow.gif" );
+ list-style-type: none;
+ list-style-position: inside;
+}
+
+.aliasBinding-step2 {
+ border-left: 2px solid #ececec;
+ padding: 0 0 0 10px;
+}
+
+/*--------------------------- Coordination admin end */
h3.blue {
padding: 2px 2px 2px 5px;
margin: 0 0 3px 0;
color: #003399;
}
+
+h4 {
+ padding-top: 0
+}
+
+
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 2008-10-15 18:07:27 UTC (rev 12073)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-10-15 18:32:23 UTC (rev 12074)
@@ -5,7 +5,9 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
xmlns:pfc="http://www.jboss.com/portal/facelet/common"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
<ui:param name="portalObjectScreen" value="#{bundle.COORDINATION_COORDINATION}"/>
<ui:define name="content">
@@ -16,25 +18,35 @@
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_CREATE}</h3>
<h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" rendered="#{empty aliasManager.availableRenderParameters}"/>
<h:form rendered="#{!empty aliasManager.availableRenderParameters}">
- <div class="float-left quarter-width">
- #{bundle.COORDINATION_ALIAS_CREATE_STEP1}
+ <div class="float-left tenpx-right">
+ <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP1}</h4>
<h:selectManyListbox id="alias" size="5" value="#{aliasManager.originalQNames}"
immediate="true" onchange="this.form.submit()">
<f:selectItems value="#{aliasManager.availableRenderParameters}"/>
</h:selectManyListbox>
</div>
+ <div class="float-left aliasBinding-step2">
+ <h:panelGroup rendered="#{!empty aliasManager.originalQNames}">
+ <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP2}</h4>
+ <div style="full-width">
+ <span><h:inputText id="aliasName" value="#{aliasManager.aliasName}"/></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}"
+ styleClass="portlet-form-button"/>
+ </span>
+ </div>
+ <div>
+ <ul class="bindingList">
+ <ui:repeat var="selectedQNames" value="#{aliasManager.originalQNames}">
+ <li>#{selectedQNames}</li>
+ </ui:repeat>
+ </ul>
+ </div>
- <h:panelGroup rendered="#{!empty aliasManager.originalQNames}">
- <div class="float-left quarter-width">
- #{bundle.COORDINATION_ALIAS_CREATE_STEP2}
- <h:inputText id="aliasName" value="#{aliasManager.aliasName}"/>
- <h:commandButton value="#{bundle.COORDINATION_ALIAS_CREATE_CREATE}"
- action="#{aliasManager.create}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasManager.cancel}"
- styleClass="portlet-form-button"/>
- </div>
</h:panelGroup>
-
+ </div>
<br class="clear"/>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java 2008-10-15 18:07:27 UTC (rev 12073)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java 2008-10-15 18:32:23 UTC (rev 12074)
@@ -50,22 +50,18 @@
public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
{
- String repeatText = req.getParameter("repeat");
+ //String repeatText = req.getParameter("repeat");
// set the text from form input
- if (repeatText != null){
- resp.setRenderParameter("repeat", repeatText);
- }
+ //if (repeatText != null){
+ //resp.setRenderParameter("repeat", repeatText);
+ //}
// request view
- resp.setPortletMode(PortletMode.VIEW);
+ //resp.setPortletMode(PortletMode.VIEW);
}
public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException
{
- //ResourceURL resourceURL = renderResponse.createResourceURL();
- //PortletURL actionURL = renderResponse.createActionURL();
-
PortletContext context = getPortletContext();
- //renderResponse.setContentType("text/html");
PortletRequestDispatcher rd = context.getRequestDispatcher(JSP_PATH + "/repeatrefresh.jsp");
rd.include(renderRequest, renderResponse);
}
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp 2008-10-15 18:07:27 UTC (rev 12073)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp 2008-10-15 18:32:23 UTC (rev 12074)
@@ -1,7 +1,7 @@
-<%@ page import="javax.portlet.PortletURL" %>
<%@ page import="javax.portlet.ResourceURL" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<!--This tag establishes three objects; renderRequest, renderResponse and portletConfig for use in this JSP page.-->
<portlet:defineObjects/>
<%
ResourceURL resourceURL = renderResponse.createResourceURL();
@@ -23,7 +23,9 @@
<h4>Partial Refresh Repeater Demo</h4>
<div class='half-width float-left'>
- <form method='post' id="testrepeatform" name="testrepeatform" action="<portlet:actionURL/>"
+
+ <!--Simple ajax repeater via a form, note that the action does not matter-->
+ <form method='post' id="testrepeatform" name="testrepeatform" action=""
onsubmit="ajaxRequest('<%=resourceURL%>','repeat-div',Form.serialize(this),true); return false;">
<font class='portlet-font'>Repeat Demo:</font><br/>
<input class='portlet-form-input-field' type='text' value='' size='12' name="repeat" id="repeat"
@@ -43,10 +45,14 @@
<div class='full-width'>
<div class='float-left third-width'>
+ <!--Parameters set on a resource URL are not render parameters but-->
+ <!--parameters for serving this resource and will last only for the current serveResource request. -->
+ <!--Example 1-->
<!--Here we set the parameters on the URL via the ajax request-->
<a href="javascript: ajaxRequest('<%=resourceURL%>','output-div','prodId=1',true);">Product1</a><br/>
+ <!--Example 2-->
<!--For the next 2, we use the resourceURL to set the params-->
<%resourceURL.setParameter("prodId","2");%>
<a href="javascript: ajaxRequest('<%=resourceURL%>','output-div','',true);">Product2</a><br/>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r12073 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-10-15 14:07:27 -0400 (Wed, 15 Oct 2008)
New Revision: 12073
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
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/WSRPTestCase.java
Log:
few id fixes
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-10-15 17:05:09 UTC (rev 12072)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-10-15 18:07:27 UTC (rev 12073)
@@ -11,16 +11,16 @@
@Test(groups = { "cms_dashboard" }, enabled = true, description = "Dashboard issues test case.")
public class DashboardTestCase extends JBossPortalSeleniumTestCase {
- private static final String SUBMIT_ADDCENTER = "layoutForm:a_center";
- private static final String SUBMIT_ADDLEFT = "layoutForm:a_left";
+ private static final String SUBMIT_ADDCENTER = "//input[contains(@id,'layoutForm:a_center";
+ private static final String SUBMIT_ADDLEFT = "//input[contains(@id,'layoutForm:a_left";
private static final String LINK_CONFIGURE_DASHBOARD = "link=Configure dashboard";
private static final String LINK_DASHBOARD = "link=Dashboard";
private static final String SELECT_PAGE = "page-selector-form:pageNameSelector";
- private static final String INPUT_PAGENAME = "dashboard-form:pageName";
- private static final String SUBMIT_CREATEPAGE = "dashboard-form:save-button";
- private static final String SELECT_LAYOUT = "dashboardLayoutForm:layoutSelector";
- private static final String SUBMIT_LAYOUTSEL = "dashboardLayoutForm:update-layout";
- private static final String SELECT_THEME = "dashboardThemeForm:themeSelector";
+ private static final String INPUT_PAGENAME = "//input[contains(@id,'dashboard-form:pageName";
+ private static final String SUBMIT_CREATEPAGE = "//input[contains(@id,'dashboard-form:save-button";
+ private static final String SELECT_LAYOUT = "//input[contains(@id,'dashboardLayoutForm:layoutSelector";
+ private static final String SUBMIT_LAYOUTSEL = "//input[contains(@id,'dashboardLayoutForm:update-layout";
+ private static final String SELECT_THEME = "//input[contains(@id,'dashboardThemeForm:themeSelector";
private static final String SUBMIT_THEMESEL = "dashboardThemeForm:update-theme";
@BeforeMethod(groups = { "log" })
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 2008-10-15 17:05:09 UTC (rev 12072)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-10-15 18:07:27 UTC (rev 12073)
@@ -16,8 +16,15 @@
@Test(groups = { "admin_ui" }, enabled = true)
public class IdentityAdminTestCase extends JBossPortalSeleniumTestCase {
- private static final String INPUT_PASS_CHANGE_SUBMIT = "//input[contains(@id,'jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_viewRoot:change-pwd-form:j_id31')]";
- private static final String INPUT_PASS_CHANGE_CANCEL = "//input[contains(@id,'change-pwd-form:cancel')]";
+ private static final String SUB_EDIT_USER_EMAIL_CANCEL = "profile-form:cancel";
+ private static final String INP_EDIT_USER_EMAIL = "profile-form:email";
+ private static final String SUB_ROLE_SEARCH_USER = "//input[contains(@id,'search-user-form:search')]";
+ 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(@id,'change-pwd-form:j_id31')]";
+ private static final String SUB_PASS_CHANGE_CANCEL = "//input[contains(@id,'change-pwd-form:cancel')]";
private static final String INPUT_PASS_CHANGE_P2 = "//input[contains(@id,':change-pwd-form:passwordCheck')]";
private static final String INPUT_PASS_CHANGE_P1 = "//input[contains(@id,':change-pwd-form:password')]";
private static final String LINK_CHANGE_PASS = "//a[contains(@id,':profile-form:change-pwd-adm-link')]";
@@ -209,8 +216,8 @@
int r = findTableRow(TABLE_USERLIST, "editMe", 0);
selenium.click(MessageFormat.format(LINK_T_USRLIST_EDIT, r - 1));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type("profile-form:email", "editMe2(a)redhat.com");
- selenium.click("profile-form:cancel");
+ selenium.type(INP_EDIT_USER_EMAIL, "editMe2(a)redhat.com");
+ selenium.click(SUB_EDIT_USER_EMAIL_CANCEL);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("editMe(a)redhat.com"));
@@ -221,7 +228,7 @@
selenium.click(MessageFormat.format(LINK_T_USRLIST_EDIT, r - 1));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type("profile-form:email", "editMe2(a)redhat.com");
+ selenium.type(INP_EDIT_USER_EMAIL, "editMe2(a)redhat.com");
selenium.select("profile-form:timezone", "label=(GMT -12:00 hours) Eniwetok, Kwajalein");
selenium.select("profile-form:theme", "label=portal.industrial");
selenium.select("profile-form:locale", "label=Albanian");
@@ -271,7 +278,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type(INPUT_PASS_CHANGE_P1, "changePass2");
selenium.type(INPUT_PASS_CHANGE_P2, "changePass2");
- selenium.click(INPUT_PASS_CHANGE_CANCEL);
+ selenium.click(SUB_PASS_CHANGE_CANCEL);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertFalse(selenium.isTextPresent("Password has been updated."));
@@ -294,7 +301,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type(INPUT_PASS_CHANGE_P1, "changePass2");
selenium.type(INPUT_PASS_CHANGE_P2, "changePass2");
- selenium.click(INPUT_PASS_CHANGE_SUBMIT);
+ selenium.click(SUB_PASS_CHANGE_SUBMIT);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Password has been updated."));
@@ -322,16 +329,16 @@
selenium.waitForPageToLoad(PAGE_LOAD);
//search for the real member of current role
- selenium.type("search-user-form:searchString", "newRoleMember");
- selenium.click("search-user-form:search");
+ selenium.type(INP_ROLE_SEARCH_USER, "newRoleMember");
+ selenium.click(SUB_ROLE_SEARCH_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
r = findTableRow(TABLE_ROLEMEMBERS, "newRoleMember", 0);
Assert.assertTrue(r>0, "Assigned member not found in the role members table.");
//search for the non-member user of current role
- selenium.type("search-user-form:searchString", "newRoleNonMember");
- selenium.click("search-user-form:search");
+ selenium.type(INP_ROLE_SEARCH_USER, "newRoleNonMember");
+ selenium.click(SUB_ROLE_SEARCH_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertFalse(selenium.isElementPresent(TABLE_ROLEMEMBERS), "Not assigned member found in the role members table.");
@@ -361,8 +368,8 @@
selenium.click(MessageFormat.format(LINK_T_ROLLIST_EDIT, r -1));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type("edit-role-link:display-Name", "editedRoleDisplay");
- selenium.click("edit-role-link:cancel");
+ selenium.type(INP_EDIT_ROLE_NAME, "editedRoleDisplay");
+ selenium.click(SUB_EDIT_ROLE_CANCEL);
selenium.waitForPageToLoad(PAGE_LOAD);
r = findTableRow(TABLE_ROLELIST, "editRoleDisplay", 1);
@@ -376,8 +383,8 @@
selenium.click(MessageFormat.format(LINK_T_ROLLIST_EDIT, r-1));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type("edit-role-link:display-Name", "editedRoleDisplay");
- selenium.click("edit-role-link:submit");
+ selenium.type(INP_EDIT_ROLE_NAME, "editedRoleDisplay");
+ selenium.click(SUB_EDIT_ROLE_SUBMIT);
selenium.waitForPageToLoad(PAGE_LOAD);
r = findTableRow(TABLE_ROLELIST, "editRoleDisplay", 1);
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 2008-10-15 17:05:09 UTC (rev 12072)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-15 18:07:27 UTC (rev 12073)
@@ -11,38 +11,39 @@
*/
@Test(groups = { "cms_wsrp" }, enabled = true, description = "WSRP test case.")
public class WSRPTestCase extends JBossPortalSeleniumTestCase {
-
- private static final String SUBMIT_REFRESH_CANCEL = "edit-cons-form:list-cons-link_1";
- private static final String SUBMIT_PROD_SAVE = "producer-form:save-producer";
- private static final String SUBMIT_CONSDEL_CONF = "confirm-delete-form:destroy-link";
+ private static final String SUBMIT_REFRESH_CANCEL = "//input[contains(@id,'edit-cons-form:list-cons-link_1')]";
+ private static final String SUBMIT_PROD_SAVE = "//input[contains(@id,'producer-form:save-producer')]";
+ private static final String SUBMIT_CONSDEL_CONF = "//input[contains(@id,'confirm-delete-form:destroy-linkv";
- private static final String SUBMIT_CONS_REGVAL = "edit-cons-form:refresh-cons-link";
- private static final String SUBMIT_REFRESHFINAL = "edit-cons-form:refresh-cons-link";
+ private static final String SUBMIT_CONS_REGVAL = "//input[contains(@id,'edit-cons-form:refresh-cons-link')]";
+ private static final String SUBMIT_REFRESHFINAL = "//input[contains(@id,'edit-cons-form:refresh-cons-link')]";
- private static final String INPUT_CONS_REGVALUE = "edit-cons-form:prop-value-input";
- private static final String SUBMIT_REFRESHSAVE = "edit-cons-form:refresh-cons-link";
- private static final String INPUT_CONSWSDL = "edit-cons-form:wsdl";
- private static final String INPUT_CACHEEXP = "edit-cons-form:cache";
- private static final String SUBMIT_ADDPROP_INIT = "producer-form:add-reg-prop";
- private static final String SUBMIT_ADDPROP = "producer-form:add-reg-prop";
- private static final String INPUT_PROPHINT = "producer-form:reg-properties:0:hint";
- private static final String INPUT_PROPLABEL = "producer-form:reg-properties:0:label";
- private static final String INPUT_PROPNAME = "producer-form:reg-properties:0:name";
- private static final String SUBMIT_CREATECONS = "createConsumer:createConsumerButton";
- private static final String INPUT_CREATECONS = "createConsumer:consumerName";
- private static final String ID_LINK_PRODCONF = "cons-temp-form:producer-link";
- private static final String ID_LINK_CONSCONF = "producer-temp-form:consumersTab";
- private static final String LINK_CONSUMER_HOME ="cons-temp-form1:list-cons-link";
+ private static final String INPUT_CONS_REGVALUE = "//input[contains(@id,'edit-cons-form:existingProps:0:prop-value-input')]";
+ private static final String SUBMIT_REFRESHSAVE = "//input[contains(@id,'edit-cons-form:refresh-cons-link')]";
+ private static final String INPUT_CONSWSDL = "//input[contains(@id,'edit-cons-form:wsdl')]";
+ private static final String INPUT_CACHEEXP = "//input[contains(@id,'edit-cons-form:cache')]";
+ private static final String SUBMIT_ADDPROP_INIT = "//input[contains(@id,'producer-form:add-reg-prop')]";
+ private static final String SUBMIT_ADDPROP = "//input[contains(@id,'producer-form:add-reg-prop')]";
+ private static final String INPUT_PROPHINT = "//input[contains(@id,'producer-form:reg-properties:0:hint')]";
+ private static final String INPUT_PROPLABEL = "//input[contains(@id,'producer-form:reg-properties:0:label')]";
+ private static final String INPUT_PROPNAME = "//input[contains(@id,'producer-form:reg-properties:0:name')]";
+ private static final String SUBMIT_CREATECONS = "//input[contains(@id,'createConsumer:createConsumerButton')]";
+ private static final String INPUT_CREATECONS = "//input[contains(@id,'createConsumer:consumerName')]";
+ private static final String ID_LINK_PRODCONF = "//a[contains(@id,'cons-temp-form:producer-link')]";
+ private static final String ID_LINK_CONSCONF = "//a[contains(@id,'producer-temp-form:consumersTab')]";
+ private static final String LINK_CONSUMER_HOME ="//a[contains(@id,'cons-temp-form1:list-cons-link')]";
- private static final String LINK_T_CONS_CON="consumer-list-form:consumersList:{0}:configure";
- private static final String LINK_T_CONS_REF="consumer-list-form:consumersList:{0}:refresh";
- private static final String LINK_T_CONS_ACT="consumer-list-form:consumersList:{0}:activate";
- private static final String LINK_T_CONS_DEA="consumer-list-form:consumersList:{0}:activate";
- private static final String LINK_T_CONS_REG="consumer-list-form:consumersList:{0}:register";
- private static final String LINK_T_CONS_DER="consumer-list-form:consumersList:{0}:register";
- private static final String LINK_T_CONS_DEL="consumer-list-form:consumersList:{0}:delete";
+ private static final String LINK_T_CONS_CON="//a[contains(@id,''consumer-list-form:consumersList:{0}:configure'')]";
+ private static final String LINK_T_CONS_REF="//a[contains(@id,''consumer-list-form:consumersList:{0}:refresh'')]";
+ private static final String LINK_T_CONS_ACT="//a[contains(@id,''consumer-list-form:consumersList:{0}:activate'')]";
+ private static final String LINK_T_CONS_DEA="//a[contains(@id,''consumer-list-form:consumersList:{0}:activate'')]";
+ private static final String LINK_T_CONS_REG="//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')]";
+ private static final String LINK_T_CONS_DER="//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')]";
+ private static final String LINK_T_CONS_DEL="//a[contains(@id,''consumer-list-form:consumersList:{0}:delete'')]";
+
+
public static String WSRP_CONSUMER_TABLE = "consumer-list-form:consumersList";
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r12072 - branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-10-15 13:05:09 -0400 (Wed, 15 Oct 2008)
New Revision: 12072
Modified:
branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
Log:
identityt admin id fix
Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-10-15 16:30:12 UTC (rev 12071)
+++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-10-15 17:05:09 UTC (rev 12072)
@@ -16,6 +16,7 @@
@Test(groups = { "admin_ui" }, enabled = true)
public class IdentityAdminTestCase extends JBossPortalSeleniumTestCase {
+ private static final String INP_EDIT_ROLE_NAME = "edit-role-link:display-Name";
public static final String TABLE_USERLIST = "search-user-form1:userlist";
public static final String LINK_T_USRLIST_DEL = "search-user-form1:userlist:{0}:delete-user-link";
public static final String LINK_T_USRLIST_ROLES = "search-user-form1:userlist:{0}:assign-role-link";
@@ -352,7 +353,7 @@
selenium.click(MessageFormat.format(LINK_T_ROLLIST_EDIT, r -1));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type("edit-role-link:display-name", "editedRoleDisplay");
+ selenium.type(INP_EDIT_ROLE_NAME, "editedRoleDisplay");
selenium.click("edit-role-link:cancel");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -367,7 +368,7 @@
selenium.click(MessageFormat.format(LINK_T_ROLLIST_EDIT, r-1));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type("edit-role-link:display-Name", "editedRoleDisplay");
+ selenium.type(INP_EDIT_ROLE_NAME, "editedRoleDisplay");
selenium.click("edit-role-link:submit");
selenium.waitForPageToLoad(PAGE_LOAD);
17 years, 7 months
- 1
- 0