JBoss Portal SVN: r12007 - branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-30 18:27:59 -0400 (Tue, 30 Sep 2008)
New Revision: 12007
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
Log:
- Added convenience methods to make usage of dataTable in JSF easier.
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-09-30 22:25:43 UTC (rev 12006)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-09-30 22:27:59 UTC (rev 12007)
@@ -29,12 +29,15 @@
import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo;
import org.jboss.portal.wsrp.consumer.ProducerInfo;
import org.jboss.portal.wsrp.consumer.RegistrationInfo;
+import org.jboss.portal.wsrp.consumer.RegistrationProperty;
import javax.faces.context.FacesContext;
import javax.faces.event.ValueChangeEvent;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -284,17 +287,37 @@
return getProducerInfo().hasLocalRegistrationInfo();
}
+ public boolean isRegistrationPropertiesEmpty()
+ {
+ RegistrationInfo regInfo = getProducerInfo().getRegistrationInfo();
+ return regInfo == null || regInfo.isRegistrationPropertiesEmpty();
+ }
+
+ public boolean isExpectedRegistrationPropertiesEmpty()
+ {
+ return getExpectedRegistrationInfo().isRegistrationPropertiesEmpty();
+ }
+
public RegistrationInfo getExpectedRegistrationInfo()
{
if (expectedRegistrationInfo == null)
{
- Map sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
- expectedRegistrationInfo = (RegistrationInfo)sessionMap.get(ConsumerManagerBean.EXPECTED_REG_INFO_KEY);
+ expectedRegistrationInfo = beanContext.getFromSession(ConsumerManagerBean.EXPECTED_REG_INFO_KEY, RegistrationInfo.class);
}
return expectedRegistrationInfo;
}
+ public List<RegistrationProperty> getRegistrationProperties()
+ {
+ return new LinkedList<RegistrationProperty>(getProducerInfo().getRegistrationInfo().getRegistrationProperties().values());
+ }
+
+ public List<RegistrationProperty> getExpectedRegistrationProperties()
+ {
+ return new ArrayList<RegistrationProperty>(getExpectedRegistrationInfo().getRegistrationProperties().values());
+ }
+
// Actions
public String update()
@@ -361,7 +384,7 @@
}
}
- // if the registration is locally modified, bypassed the refresh as it will not yield a proper result
+ // if the registration is locally modified, bypass the refresh as it will not yield a proper result
if (!isRegistrationLocallyModified())
{
manager.refresh(consumer);
15 years, 6 months
JBoss Portal SVN: r12006 - branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-30 18:25:43 -0400 (Tue, 30 Sep 2008)
New Revision: 12006
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java
Log:
- Added isRegistrationPropertiesEmpty method.
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2008-09-30 22:23:28 UTC (rev 12005)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2008-09-30 22:25:43 UTC (rev 12006)
@@ -232,9 +232,14 @@
public boolean hasLocalInfo()
{
- return persistentRegistrationHandle != null || (persistentRegistrationProperties != null && !persistentRegistrationProperties.isEmpty());
+ return persistentRegistrationHandle != null || isRegistrationPropertiesEmpty();
}
+ public boolean isRegistrationPropertiesEmpty()
+ {
+ return persistentRegistrationProperties != null && !persistentRegistrationProperties.isEmpty();
+ }
+
public RegistrationData getRegistrationData()
{
registrationData = WSRPTypeFactory.createDefaultRegistrationData();
15 years, 6 months
JBoss Portal SVN: r12005 - branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-30 18:23:28 -0400 (Tue, 30 Sep 2008)
New Revision: 12005
Modified:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java
Log:
- Added getFromSession method.
Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java 2008-09-30 17:03:17 UTC (rev 12004)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java 2008-09-30 22:23:28 UTC (rev 12005)
@@ -41,6 +41,7 @@
private static final String RESOURCE_NAME = "Resource";
private static final String UNEXPECTED_ERROR = "bean_support_unexpected_error";
private static final String CAUSE = "bean_support_cause";
+ private static final String CURRENT_PLACEHOLDER = "###";
/**
@@ -153,10 +154,12 @@
* name, then only an object of the same type (as defined by {@link Class#isAssignableFrom(Class)}) can be assigned
* to this name.
*
- * @param name the name identifying the object to be replaced
+ * @param name the name identifying the object to be replaced
* @param newValue the new value for the object to be replaced or <code>null</code> if the object is to be removed
- * @param <T> the type of the object to be replaced
+ * @param <T> the type of the object to be replaced
* @return the new value for the object or <code>null</code> if the remove semantics is used
+ * @throws IllegalArgumentException if the new value for the identified object is not compatible with the currently
+ * stored value
*/
public <T> T replaceInSession(String name, T newValue)
{
@@ -170,14 +173,48 @@
return null;
}
- Object current = sessionMap.get(name);
- // check that the new bean is compatible with the previously assigned
- if (current != null && !newValue.getClass().isAssignableFrom(current.getClass()))
- {
- throw new IllegalArgumentException("Provided object: " + newValue + " is not compatible with previously assigned '"
- + name + "' object: " + current);
- }
+ getFromSession(name, newValue.getClass(), sessionMap, "Provided object: " + newValue
+ + " is not compatible with previously assigned '" + name + "' object: " + CURRENT_PLACEHOLDER);
sessionMap.put(name, newValue);
return newValue;
}
+
+ /**
+ * Retrieves the session object associated with the specified name and the expected type.
+ *
+ * @param name name of the session object to be retrieved
+ * @param expectedClass expected class of the object
+ * @param <T> type of the object to be retrieved
+ * @return the session object associated with the specified name
+ * @throws IllegalArgumentException if the value associated with the specified name is not <code>null</code> and does
+ * not match the specified expected class
+ */
+ public <T> T getFromSession(String name, Class<T> expectedClass)
+ {
+ return getFromSession(name, expectedClass, getSessionMap(), "Current object:" + CURRENT_PLACEHOLDER
+ + " is not compatible with expected class " + expectedClass + " for '" + name + "'");
+ }
+
+ /**
+ * @param name name of the session attribute to retrieve
+ * @param expectedClass expected class of the attribute
+ * @param sessionMap the session map to retrieve the attribute from
+ * @param errorMessage the error message that will be used if the attribute value is not of the expected class, in
+ * which {@link #CURRENT_PLACEHOLDER} will be substituted by the current value of the attribute
+ * at runtime
+ * @param <T> the type of the object to be retrieved
+ * @return the value associated with the specified name
+ * @throws IllegalArgumentException if the value associated with the specified name is not <code>null</code> and does
+ * not match the specified expected class
+ */
+ private <T> T getFromSession(String name, Class<T> expectedClass, Map<String, Object> sessionMap, String errorMessage)
+ {
+ Object result = sessionMap.get(name);
+ if (result != null && !expectedClass.isAssignableFrom(result.getClass()))
+ {
+ throw new IllegalArgumentException(errorMessage.replace(CURRENT_PLACEHOLDER, result.toString()));
+ }
+
+ return expectedClass.cast(result);
+ }
}
15 years, 6 months
JBoss Portal SVN: r12004 - modules/cms/trunk.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-30 13:03:17 -0400 (Tue, 30 Sep 2008)
New Revision: 12004
Modified:
modules/cms/trunk/.classpath
Log:
eclipse setup based on cleaned up dependencies. All local libs are gone. Thanks Thomas!!
Modified: modules/cms/trunk/.classpath
===================================================================
--- modules/cms/trunk/.classpath 2008-09-30 16:34:42 UTC (rev 12003)
+++ modules/cms/trunk/.classpath 2008-09-30 17:03:17 UTC (rev 12004)
@@ -1,111 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="cms-jackrabbit/src/main/java"/>
- <classpathentry kind="src" output="target/test-classes" path="cms-jackrabbit/src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" path="cms-jackrabbit/src/main/resources"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="cms-jackrabbit/src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/bsh/bsh/1.3.0/bsh-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/cargo/cargo-core-uberjar/0.8/cargo-core-uberjar-0.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/portal/common/common-common/1.2.0/common-common-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/cargo/core/0.9-portal/core-0.9-portal.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.4.1/ehcache-1.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/hibernate/hibernate3/3.2.4.SP1/hibernate3-3.2.4.SP1.jar"/>
- <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/portal/identity/identity-identity/1.0.2/identity-identity-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss/4.2.2.GA/jboss-4.2.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss/4.0.4.GA/jboss-4.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR1/jboss-aop-2.0.0.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-common-jdbc-wrapper/4.0.4.GA/jboss-common-jdbc-wrapper-4.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta9/jboss-dependency-2.0.0.Beta9.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-j2ee/4.2.0.GA/jboss-j2ee-4.2.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-jca/4.0.4.GA/jboss-jca-4.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.0.GA/jboss-jmx-4.2.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta9/jboss-kernel-2.0.0.Beta9.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-local-jdbc/4.2.2.GA/jboss-local-jdbc-4.2.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-jdk/2.0.2.GA/jboss-logging-jdk-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-metatype/2.0.0.Beta9/jboss-metatype-2.0.0.Beta9.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-system/4.2.2.GA/jboss-system-4.2.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-transaction/4.0.4.GA/jboss-transaction-4.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit/1.2.0.Beta2/jboss-unit-1.2.0.Beta2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-mc/1.2.0.Beta2/jboss-unit-mc-1.2.0.Beta2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-tooling-ant/1.2.0.Beta2/jboss-unit-tooling-ant-1.2.0.Beta2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-tooling-core/1.2.0.Beta2/jboss-unit-tooling-core-1.2.0.Beta2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/1.4.1.SP3/jbosscache-core-1.4.1.SP3.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossha/4.2.2.GA/jbossha-4.2.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jbpm/jbpm-jpdl/3.2.2/jbpm-jpdl-3.2.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl104-over-slf4j/1.3.0/jcl104-over-slf4j-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/sleepycat/je/3.0.12/je-3.0.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.4.1/jgroups-2.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jnpserver/4.0.4.GA/jnpserver-4.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/jsr107cache/jsr107cache/1.0/jsr107cache-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/0.9.4/nekohtml-0.9.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-opends/opends-core/legacy/opends-core-legacy.jar"/>
- <classpathentry kind="var" path="M2_REPO/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
- <classpathentry kind="var" path="M2_REPO/local/portal-core-lib/2.7/portal-core-lib-2.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/local/portal-jems-lib/2.7/portal-jems-lib-2.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/local/portal-search-lib/2.7/portal-search-lib-2.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/local/portal-security-lib/2.7/portal-security-lib-2.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/local/portal-server-lib/2.7/portal-server-lib-2.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/unit/portal-test/1.2.0.Beta2/portal-test-1.2.0.Beta2.jar"/>
- <classpathentry kind="var" path="M2_REPO/local/portal-workflow-lib/2.7/portal-workflow-lib-2.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/textmining/tm-extractors/0.4/tm-extractors-0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="cms-jackrabbit/src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="cms-jackrabbit/src/test/java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry excluding="**/*.java" kind="src" path="cms-jackrabbit/src/main/resources"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="cms-jackrabbit/src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/bsh/bsh/1.3.0/bsh-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/cargo/cargo-core-uberjar/0.8/cargo-core-uberjar-0.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/portal/common/common-common/1.2.0/common-common-1.2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cargo/core/0.9-portal/core-0.9-portal.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/portal/core/core/2.7.0.CR1/core-2.7.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.4.1/ehcache-1.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hibernate/hibernate3/3.2.4.SP1/hibernate3-3.2.4.SP1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/portal/identity/identity-identity/1.0.2/identity-identity-1.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss/4.2.2.GA/jboss-4.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss/4.0.4.GA/jboss-4.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR1/jboss-aop-2.0.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-common-jdbc-wrapper/4.0.4.GA/jboss-common-jdbc-wrapper-4.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta9/jboss-dependency-2.0.0.Beta9.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-j2ee/4.2.0.GA/jboss-j2ee-4.2.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-jca/4.0.4.GA/jboss-jca-4.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.0.GA/jboss-jmx-4.2.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta9/jboss-kernel-2.0.0.Beta9.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-local-jdbc/4.2.2.GA/jboss-local-jdbc-4.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-jdk/2.0.2.GA/jboss-logging-jdk-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-metatype/2.0.0.Beta9/jboss-metatype-2.0.0.Beta9.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-system/4.2.2.GA/jboss-system-4.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-transaction/4.0.4.GA/jboss-transaction-4.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit/1.2.0.Beta2/jboss-unit-1.2.0.Beta2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-mc/1.2.0.Beta2/jboss-unit-mc-1.2.0.Beta2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-tooling-ant/1.2.0.Beta2/jboss-unit-tooling-ant-1.2.0.Beta2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-tooling-core/1.2.0.Beta2/jboss-unit-tooling-core-1.2.0.Beta2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/1.4.1.SP3/jbosscache-core-1.4.1.SP3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossha/4.2.2.GA/jbossha-4.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jbpm/jbpm-jpdl/3.2.2/jbpm-jpdl-3.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl104-over-slf4j/1.3.0/jcl104-over-slf4j-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sleepycat/je/3.0.12/je-3.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/portal/core/jems/2.7.0.CR1/jems-2.7.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.4.1/jgroups-2.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jnpserver/4.0.4.GA/jnpserver-4.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/jsr107cache/jsr107cache/1.0/jsr107cache-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/0.9.4/nekohtml-0.9.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-opends/opends-core/legacy/opends-core-legacy.jar"/>
+ <classpathentry kind="var" path="M2_REPO/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/unit/portal-test/1.2.0.Beta2/portal-test-1.2.0.Beta2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/portal/core/search/2.7.0.CR1/search-2.7.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/portal/core/security/2.7.0.CR1/security-2.7.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/portal/core/server/2.7.0.CR1/server-2.7.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/textmining/tm-extractors/0.4/tm-extractors-0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/portal/core/workflow/2.7.0.CR1/workflow-2.7.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+</classpath>
\ No newline at end of file
15 years, 6 months
JBoss Portal SVN: r12003 - branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-30 12:34:42 -0400 (Tue, 30 Sep 2008)
New Revision: 12003
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfoPostLoadEventListener.java
Log:
- Made listener extend default one. Seems to be properly called now.
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfoPostLoadEventListener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfoPostLoadEventListener.java 2008-09-29 16:05:47 UTC (rev 12002)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfoPostLoadEventListener.java 2008-09-30 16:34:42 UTC (rev 12003)
@@ -23,13 +23,13 @@
package org.jboss.portal.wsrp.consumer;
import org.hibernate.event.PostLoadEvent;
-import org.hibernate.event.PostLoadEventListener;
+import org.hibernate.event.def.DefaultPostLoadEventListener;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-public class RegistrationInfoPostLoadEventListener implements PostLoadEventListener
+public class RegistrationInfoPostLoadEventListener extends DefaultPostLoadEventListener
{
/**
* Once the object is loaded from Hibernate, greedily load the associated RegistrationProperties and register with
@@ -49,5 +49,7 @@
property.setListener(info);
}
}
+
+ super.onPostLoad(event);
}
}
15 years, 6 months
JBoss Portal SVN: r12002 - branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.
by portal-commits@lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-29 12:05:47 -0400 (Mon, 29 Sep 2008)
New Revision: 12002
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml
Log:
[JBPORTAL-2101] adding ids to identity admin ui
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml 2008-09-29 16:03:37 UTC (rev 12001)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml 2008-09-29 16:05:47 UTC (rev 12002)
@@ -30,7 +30,7 @@
<h:outputText id="rolename" value="#{editrolemgr.uiRole.name}" />
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_DISPLAY}"/>
- <h:inputText value="#{editrolemgr.uiRole.displayName}"/>
+ <h:inputText id="display-name" value="#{editrolemgr.uiRole.displayName}"/>
</h:panelGrid>
<hr/>
<p style="text-align: right;">
15 years, 6 months
JBoss Portal SVN: r12001 - branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.
by portal-commits@lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-29 12:03:37 -0400 (Mon, 29 Sep 2008)
New Revision: 12001
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
Log:
[JBPORTAL-2101] adding ids to identity admin ui
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2008-09-27 08:30:17 UTC (rev 12000)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2008-09-29 16:03:37 UTC (rev 12001)
@@ -30,7 +30,7 @@
<h:outputText id="rolename" value="#{editrolemgr.uiRole.name}" />
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_DISPLAY}"/>
- <h:inputText value="#{editrolemgr.uiRole.displayName}"/>
+ <h:inputText id="display-Name" value="#{editrolemgr.uiRole.displayName}"/>
</h:panelGrid>
<hr/>
<p style="text-align: right;">
15 years, 6 months
JBoss Portal SVN: r12000 - in branches/JBoss_Portal_Branch_2_7: core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers and 2 other directories.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-27 04:30:17 -0400 (Sat, 27 Sep 2008)
New Revision: 12000
Added:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfoPostLoadEventListener.java
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml
Log:
- Added Hibernate post-load event listener: does not currently work due to 2nd level cache interference (?)
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-09-26 15:13:04 UTC (rev 11999)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-09-27 08:30:17 UTC (rev 12000)
@@ -510,6 +510,7 @@
FacesContext.getCurrentInstance().renderResponse();
}
+ // todo: valueChangeListener not needed anymore when events on RegistrationProperties work
public void regPropListener(ValueChangeEvent event)
{
if (!registrationLocallyModified)
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2008-09-26 15:13:04 UTC (rev 11999)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2008-09-27 08:30:17 UTC (rev 12000)
@@ -95,6 +95,7 @@
<td>#{prop.value.name}</td>
<td>#{prop.value.description.label.value}</td>
<td>
+ <!-- todo: valueChangeListener not needed anymore when events on RegistrationProperties work -->
<h:inputText id="prop-value-input" value="#{prop.value.value}" size="50"
valueChangeListener="#{consumer.regPropListener}"
disabled="#{consumer.registrationModified}"/>
Added: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfoPostLoadEventListener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfoPostLoadEventListener.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfoPostLoadEventListener.java 2008-09-27 08:30:17 UTC (rev 12000)
@@ -0,0 +1,53 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, 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.
+*/
+
+package org.jboss.portal.wsrp.consumer;
+
+import org.hibernate.event.PostLoadEvent;
+import org.hibernate.event.PostLoadEventListener;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class RegistrationInfoPostLoadEventListener implements PostLoadEventListener
+{
+ /**
+ * Once the object is loaded from Hibernate, greedily load the associated RegistrationProperties and register with
+ * them as a listener for changes in their value.
+ *
+ * @param event
+ */
+ public void onPostLoad(PostLoadEvent event)
+ {
+ Object entity = event.getEntity();
+ if (entity instanceof RegistrationInfo)
+ {
+ RegistrationInfo info = (RegistrationInfo)entity;
+
+ for (RegistrationProperty property : info.getRegistrationProperties().values())
+ {
+ property.setListener(info);
+ }
+ }
+ }
+}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java 2008-09-26 15:13:04 UTC (rev 11999)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java 2008-09-27 08:30:17 UTC (rev 12000)
@@ -231,12 +231,18 @@
private void notifyListener(String oldValue, String newValue)
{
+ // listener can be null, especially when props are unfrozen from Hibernate
if (listener != null)
{
listener.propertyValueChanged(this, oldValue, newValue);
}
}
+ public void setListener(PropertyChangeListener listener)
+ {
+ this.listener = listener;
+ }
+
/** todo: Should be package-only, public for tests... */
public static interface PropertyChangeListener
{
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml 2008-09-26 15:13:04 UTC (rev 11999)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml 2008-09-27 08:30:17 UTC (rev 12000)
@@ -54,5 +54,10 @@
<!-- Mapping files -->
<mapping resource="conf/hibernate/consumer/domain.hbm.xml"/>
+
+ <event type="post-load">
+ <listener class="org.jboss.portal.wsrp.consumer.RegistrationInfoPostLoadEventListener"/>
+ <listener class="org.hibernate.event.def.DefaultPostLoadEventListener"/>
+ </event>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
15 years, 6 months
JBoss Portal SVN: r11999 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf.
by portal-commits@lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-26 11:13:04 -0400 (Fri, 26 Sep 2008)
New Revision: 11999
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
Log:
oops
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-09-26 15:12:22 UTC (rev 11998)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-09-26 15:13:04 UTC (rev 11999)
@@ -89,7 +89,7 @@
<f:param name="id" value="#{object.id}"/>
#{bundle.PAGE_LAYOUT}
</h:commandLink>
- <h:commandLink id="security-link action="editPageSecurity" styleClass="actionSecurity float-left"
+ <h:commandLink id="security-link" action="editPageSecurity" styleClass="actionSecurity float-left"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>#{bundle.SECURITY}
</h:commandLink>
15 years, 6 months
JBoss Portal SVN: r11998 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium: portal and 1 other directory.
by portal-commits@lists.jboss.org
Author: vrockai
Date: 2008-09-26 11:12:22 -0400 (Fri, 26 Sep 2008)
New Revision: 11998
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/JBossPortalSeleniumTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserInterceptorPortletTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
Log:
several tastcase propagations from 2.6.7
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-09-26 15:03:58 UTC (rev 11997)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-09-26 15:12:22 UTC (rev 11998)
@@ -1,21 +1,22 @@
package org.jboss.portal.test.selenium;
+import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import org.testng.Assert;
-import com.sun.java_cup.internal.internal_error;
/**
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
@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 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 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";
@@ -55,9 +56,9 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
-
- selectIfNotSelected("DashTestPage");
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
+
selenium.select(SELECT_THEME, "label=renaissance");
selenium.click(SUBMIT_THEMESEL);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -71,25 +72,20 @@
selenium.waitForPageToLoad(PAGE_LOAD);
}
-
- Assert.assertEquals(selenium.getSelectedLabel(SELECT_THEME), "renaissance","Previously selected theme other then expected.");
+ Assert.assertEquals(selenium.getSelectedLabel(SELECT_THEME), "renaissance", "Previously selected theme other then expected.");
}
- private void selectIfNotSelected(String label) {
- if (!selenium.getSelectedLabel(SELECT_PAGE).equals(label))
- selenium.select(SELECT_PAGE, "label="+label);
- selenium.waitForPageToLoad(PAGE_LOAD);
- }
+
@Test(enabled = true, dependsOnMethods = { "testCreatePage" })
public void testUpdateLayout() {
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
- selectIfNotSelected("DashTestPage");
- Assert.assertEquals(selenium.getSelectedLabel(SELECT_LAYOUT),"default","Default layout is not called \"default\".");
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
+
selenium.select(SELECT_LAYOUT, "label=generic");
selenium.click(SUBMIT_LAYOUTSEL);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -103,7 +99,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
}
- Assert.assertEquals(selenium.getSelectedLabel(SELECT_LAYOUT),"generic","Previously selected layout other then expected.");
+ Assert.assertEquals(selenium.getSelectedLabel(SELECT_LAYOUT), "generic", "Previously selected layout other then expected.");
}
@Test(enabled = true, dependsOnMethods = { "testCreatePage" })
@@ -113,41 +109,147 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
- selectIfNotSelected("DashTestPage");
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
selenium.click("link=Who's online portlet");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click("layoutForm:a_center");
+ selenium.click(SUBMIT_ADDCENTER);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=DashTestPage");
selenium.waitForPageToLoad(PAGE_LOAD);
+
Assert.assertTrue(selenium.isTextPresent("Current users"));
Assert.assertTrue(selenium.isTextPresent("Whose 1 is logged-in:"));
Assert.assertTrue(selenium.isTextPresent("[admin]"));
}
+ @Test(enabled = true, dependsOnMethods = { "testAddPortlet" })
+ public void testDeletePortlet() {
+
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_CONFIGURE_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
+
+ selenium.addSelection("layoutForm:selectMany_center", "label=CurrentUsersPortletWindow");
+ selenium.click("layoutForm:l_center");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=DashTestPage");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertFalse(selenium.isTextPresent("Current users"));
+ Assert.assertFalse(selenium.isTextPresent("Whose 1 is logged-in:"));
+ Assert.assertFalse(selenium.isTextPresent("[admin]"));
+ }
+
@Test(enabled = false, dependsOnMethods = { "testCreatePage" })
public void testAddGooglePortlet() {
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_CONFIGURE_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
- selectIfNotSelected("DashTestPage");
+ selectIfNotSelected(SELECT_PAGE,"DashTestPage");
selenium.select("abc:instanceId", "label=widget/google");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Hindu God of the Week");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click("layoutForm:a_center");
+ selenium.click(SUBMIT_ADDCENTER);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LINK_DASHBOARD);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=DashTestPage");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Hindu God of the Week"));
}
+ // http://www.jboss.com/index.html?module=bb&op=viewtopic&t=143023
+ @Test(enabled = true)
+ public void testBugResetPortletSetting() {
+ final String pageName = "page1";
+ final String pageNameNew = "page1a";
+
+ // create page
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_CONFIGURE_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.type(INPUT_PAGENAME, pageName);
+ selenium.click(SUBMIT_CREATEPAGE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertTrue(selenium.isElementPresent("link=" + pageName));
+ selenium.click("link=" + pageName);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertTrue(selenium.isTextPresent("Powered by JBoss Portal"));
+
+ // add weather portlet
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_CONFIGURE_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selectIfNotSelected(SELECT_PAGE,pageName);
+
+ selenium.click("Link=*Weather Portlet*");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(SUBMIT_ADDLEFT);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=" + pageName);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertTrue(selenium.isTextPresent("Miami, FL, US"));
+
+ // change the properties
+ selenium.click("//div[@id='dashboard:YWRtaW4=.cGFnZTE=.V2VhdGhlclBvcnRsZXRXaW5kb3c=']/div/table/tbody/tr[1]/td[2]/div/div/div[2]/span[1]/a");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.type("newzip", "41001");
+ selenium.click("submit");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("Alexandria"));
+
+ // rename portal
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_CONFIGURE_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selectIfNotSelected(SELECT_PAGE,pageName);
+
+ selenium.type("renameForm:newName", pageNameNew);
+ selenium.click("renameForm:rename-button");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ // check the portlet again
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click(LINK_DASHBOARD);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=" + pageNameNew);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ Assert.assertTrue(selenium.isTextPresent("Alexandria"), "Previously selected portlet settings were changes after renaming of portal page.");
+
+ }
+
+ // TODO write an extension for checking of ordering of elements
@Test(enabled = false, dependsOnMethods = { "testCreatePage" })
public void testReorder() {
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-09-26 15:03:58 UTC (rev 11997)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-09-26 15:12:22 UTC (rev 11998)
@@ -132,7 +132,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page.");
- final String CHECK_ROLE = MessageFormat.format(this.ID_CHECK_ROLE, role);
+ final String CHECK_ROLE = MessageFormat.format(ID_CHECK_ROLE, role);
selenium.click(CHECK_ROLE);
selenium.click(ID_SUBMIT_ASSIGN_ROLE);
@@ -155,7 +155,7 @@
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(this.ID_CHECK_ROLE, role);
+ final String CHECK_ROLE = MessageFormat.format(ID_CHECK_ROLE, role);
selenium.click(CHECK_ROLE);
selenium.click(ID_SUBMIT_ASSIGN_ROLE);
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-26 15:03:58 UTC (rev 11997)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-09-26 15:12:22 UTC (rev 11998)
@@ -38,11 +38,21 @@
if (selenium.isElementPresent(id)){
selenium.click(id);
-
+
selenium.waitForPageToLoad(PAGE_LOAD);
}
}
+
+ protected void clickIfVisible(String id, String awaited) {
+
+ if (selenium.isElementPresent(id)){
+ selenium.click(id);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ }
+ Assert.assertTrue(selenium.isTextPresent(awaited));
+ }
+ @Deprecated
protected boolean findLink(String id) {
for (String link : selenium.getAllLinks()) {
if (link.equals(id)) {
@@ -65,6 +75,23 @@
protected int countTableRows(String tableLocation){
return Integer.valueOf(selenium.getEval("selenium.countTableRows(\"" + tableLocation + "\")"));
}
+
+ protected void clickAndWait(String locator){
+ selenium.click(locator);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ }
+
+ protected void openAndWait(String locator){
+ selenium.open(locator);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ }
+
+ protected void selectIfNotSelected(String selector, String label) {
+ if (!selenium.getSelectedLabel(selector).equals(label)) {
+ selenium.select(selector, "label=" + label);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ }
+ }
protected void login(String username, String password) {
selenium.setTimeout("0");
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserInterceptorPortletTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserInterceptorPortletTestCase.java 2008-09-26 15:03:58 UTC (rev 11997)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserInterceptorPortletTestCase.java 2008-09-26 15:12:22 UTC (rev 11998)
@@ -1,15 +1,13 @@
package org.jboss.portal.test.selenium;
-import java.util.Date;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.Vector;
import org.testng.Assert;
import org.testng.annotations.Test;
-
-import com.sun.org.apache.xerces.internal.impl.dtd.models.DFAContentModel;
/**
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-26 15:03:58 UTC (rev 11997)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-09-26 15:12:22 UTC (rev 11998)
@@ -2,12 +2,10 @@
import java.text.MessageFormat;
+import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import org.testng.Assert;
-
-import com.sun.java_cup.internal.internal_error;
/**
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
@@ -17,16 +15,7 @@
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 ID_LINK_PRODCONF =
- // "_id1jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id3jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"
- // ;
- // private static final String ID_LINK_CONSCONF =
- // "_id1jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj:_id3jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj"
- // ;
-
-
- // TODO shouldn't be same as REFRESH?
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";
@@ -44,6 +33,7 @@
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 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";
@@ -51,9 +41,8 @@
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";
-
-
-// public static String WSRP_CONSUMER_TABLE = "//form[@id='_id18jbpns_2fadmin_2fWSRP_2fWSRPConfigurationPortletWindowsnpbj']/table";
+
+
public static String WSRP_CONSUMER_TABLE = "consumer-list-form:consumersList";
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
@@ -198,7 +187,6 @@
public void testBeaConsumerDelete() {
createConsumer("BEAdel", "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
- //selenium.setSpeed("2000");
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
@@ -254,7 +242,54 @@
Assert.assertEquals("tetsPropHint", selenium.getValue(INPUT_PROPHINT));
}
+
+ @Test(enabled = true, description = "Renaming a consumer through the configure button.")
+ public void testConfigureConsumer() {
+ final String name = "renameMe";
+ final String nameNew = "renameNewMe";
+ selenium.open("/portal/");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=Admin");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=WSRP");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ clickIfVisible(ID_LINK_CONSCONF);
+ clickIfVisible(LINK_CONSUMER_HOME);
+
+
+ int r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
+
+ Assert.assertTrue(r<0, "Not created consumer already in table");
+
+ // create consumer to be renamed
+ createConsumer(name, "100", "http://wsrp.bea.com:7001/producer/producer?WSDL");
+
+ clickIfVisible(ID_LINK_CONSCONF);
+ clickIfVisible(LINK_CONSUMER_HOME);
+
+ r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
+ Assert.assertTrue(r>0, "Created consumer not found in table");
+
+ // rename the consumer
+ selenium.click(MessageFormat.format(LINK_T_CONS_CON,r-1));
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ selenium.type("edit-cons-form:id", nameNew);
+ selenium.click("edit-cons-form:refresh-cons-link");
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
+ clickIfVisible(ID_LINK_CONSCONF);
+ clickIfVisible(LINK_CONSUMER_HOME);
+
+ r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
+ Assert.assertTrue(r<0, "Renamed consumer still in table");
+
+ r = findTableRow(WSRP_CONSUMER_TABLE, nameNew, 0);
+ Assert.assertTrue(r>0, "Renamed consumer not found in table");
+ }
+
private void createConsumer(String name, String timeout, String address) {
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -267,7 +302,6 @@
selenium.click(SUBMIT_CREATECONS);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type(INPUT_CACHEEXP, timeout);
- // selenium.click("link=14. Web Services for Remote Portlets (WSRP)");
selenium.type(INPUT_CONSWSDL, address);
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-09-26 15:03:58 UTC (rev 11997)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-09-26 15:12:22 UTC (rev 11998)
@@ -16,7 +16,7 @@
private static final String SUBMIT_RENAME_PORTAL = "renameForm:rename";
private static final String INPUT_RENAME_PORTAL = "renameForm:newName";
- private static final String SUBMIT_DELETE_PORTAL_CONF = "_id29jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:confirm-form:delete";
+ private static final String SUBMIT_DELETE_PORTAL_CONF = "delete-view:confirm-form:delete";
private static final String INPUT_SUBMIT_PAGECREATE = "create-page-form:create-page";
private static final String INPUT_PAGENAME = "create-page-form:pageName";
private static final String INPUT_PORTALNAME = "create-portal-form:name";
@@ -25,7 +25,7 @@
private final String TAB_PORTALOBJ_ID = "//div[@id='current']/a";
private final String LINK_PORTALS_ID = "link=*Portal Objects*";
- private final String LINK_PORTAL_HOME = "_id8jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj:_id11jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
+ private final String LINK_PORTAL_HOME = "obj-temp-form:object-link-0";
private final String TABLE_PORTAL_ADMIN = "obj-nav-form:portal-datatable";
private final String POR_TL_MAIN = "obj-nav-form:portal-datatable:{0}:object-iid-link";
@@ -62,6 +62,7 @@
selenium.click("link=Admin");
selenium.waitForPageToLoad(PAGE_LOAD);
+
clickIfVisible(TAB_PORTALOBJ_ID);
clickIfVisible(LINK_PORTALS_ID);
@@ -237,7 +238,45 @@
Assert.assertTrue(selenium.isTextPresent("Current users"));
}
+
+ @Test(enabled = true, dependsOnMethods={"testPortalCreate"})
+ public void testPageRename(){
+ String portalName = "TestPortal";
+ String pageName = "PageToRename";
+
+ createPage("TestPortal", "PageToRename");
+
+ openAndWait("/portal");
+ clickAndWait("link=Admin");
+ clickIfVisible(TAB_PORTALOBJ_ID);
+ clickIfVisible(LINK_PORTALS_ID, "Create a portal named:");
+
+ int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
+
+ clickAndWait(MessageFormat.format(POR_TL_MAIN, r));
+
+ r = findTableRow(TABLE_PORTALPAGE_ADMIN, pageName, 0) - 1;
+
+ clickAndWait(MessageFormat.format(PAG_TL_RENAME, r));
+
+ }
+
+ @Test(enabled = false)
+ public void testPageSecurity(){
+
+ }
+
+ @Test(enabled = false)
+ public void testPageTheme(){
+
+ }
+
+ @Test(enabled = false)
+ public void testPageLayout(){
+
+ }
+
private void createPortal(String name) {
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
15 years, 6 months