gatein SVN: r2774 - in portal/trunk/examples: portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root and 1 other directory.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-04-26 07:07:42 -0400 (Mon, 26 Apr 2010)
New Revision: 2774
Modified:
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml
Log:
GTNPORTAL-1062 change title of sample-ext dashboard from Sales BI to Sample Dashboard
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2010-04-26 10:52:40 UTC (rev 2773)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2010-04-26 11:07:42 UTC (rev 2774)
@@ -31,7 +31,7 @@
<uri>sample-user</uri>
<name>sample-user</name>
<label>Sample-Ext Page User</label>
- <page-reference>user::root::sales</page-reference>
+ <page-reference>user::root::sampledashboard</page-reference>
</node>
</page-nodes>
</node-navigation>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2010-04-26 10:52:40 UTC (rev 2773)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2010-04-26 11:07:42 UTC (rev 2774)
@@ -25,8 +25,8 @@
xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
- <name>sales</name>
- <title>Sales BI</title>
+ <name>sampledashboard</name>
+ <title>Sample Dashboard</title>
<access-permissions>*:/platform/users</access-permissions>
<edit-permission>*:/platform/administrators</edit-permission>
<portlet-application>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2010-04-26 10:52:40 UTC (rev 2773)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2010-04-26 11:07:42 UTC (rev 2774)
@@ -31,7 +31,7 @@
<uri>sample-user</uri>
<name>sample-user</name>
<label>Sample-Portal Page User</label>
- <page-reference>user::root::sales</page-reference>
+ <page-reference>user::root::sampledashboard</page-reference>
</node>
</page-nodes>
</node-navigation>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2010-04-26 10:52:40 UTC (rev 2773)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2010-04-26 11:07:42 UTC (rev 2774)
@@ -25,8 +25,8 @@
xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<page>
- <name>sales</name>
- <title>Sales BI</title>
+ <name>sampledashboard</name>
+ <title>Sample Dashboard</title>
<access-permissions>*:/platform/users</access-permissions>
<edit-permission>*:/platform/administrators</edit-permission>
<portlet-application>
14 years, 2 months
gatein SVN: r2773 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-04-26 06:52:40 -0400 (Mon, 26 Apr 2010)
New Revision: 2773
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_008_CreateNewPortalWithNameIsTheSameWithExistingOne.html
Log:
Change script for Test_POR_09_008_CreateNewPortalWithNameIsTheSameWithExistingOne.html
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_008_CreateNewPortalWithNameIsTheSameWithExistingOne.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_008_CreateNewPortalWithNameIsTheSameWithExistingOne.html 2010-04-26 10:36:42 UTC (rev 2772)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_008_CreateNewPortalWithNameIsTheSameWithExistingOne.html 2010-04-26 10:52:40 UTC (rev 2773)
@@ -77,13 +77,38 @@
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Choose Portal Setting--</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>xpath=//div[@id='UISiteManagement']//div[@class='UIAction']//div[@class='ActionButton BlueButton']</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>test_por_09_008</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>locale</td>
+ <td>label=English</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>skin</td>
+ <td>label=Default</td>
+</tr>
+<tr>
<td>echo</td>
- <td>--Choose Portal Setting--</td>
+ <td>--Choose Properties--</td>
<td></td>
</tr>
<tr>
@@ -97,28 +122,38 @@
<td></td>
</tr>
<tr>
+ <td>select</td>
+ <td>sessionAlive</td>
+ <td>label=On Demand</td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Select Permission Setting--</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
- <td>name</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td>
<td></td>
</tr>
<tr>
- <td>type</td>
- <td>name</td>
- <td>test_por_09_008</td>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td>
+ <td></td>
</tr>
<tr>
<td>echo</td>
- <td>--Select Permission Setting--</td>
+ <td>--Choose Access Permission Setting--</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[4]//div[@class='MiddleTab']</td>
+ <td>publicMode</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>publicMode</td>
+ <td>echo</td>
+ <td>--Choose Edit Permission Setting--</td>
<td></td>
</tr>
<tr>
@@ -188,7 +223,7 @@
</tr>
<tr>
<td>echo</td>
- <td>-- Add new portal with name is the same with existing one --</td>
+ <td>-- Add new portal with name is the same with existing one--</td>
<td></td>
</tr>
<tr>
@@ -202,13 +237,38 @@
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Choose Portal Setting--</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>xpath=//div[@id='UISiteManagement']//div[@class='UIAction']//div[@class='ActionButton BlueButton']</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>test_por_09_008</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>locale</td>
+ <td>label=English</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>skin</td>
+ <td>label=Default</td>
+</tr>
+<tr>
<td>echo</td>
- <td>--Choose Portal Setting--</td>
+ <td>--Choose Properties--</td>
<td></td>
</tr>
<tr>
@@ -222,28 +282,38 @@
<td></td>
</tr>
<tr>
+ <td>select</td>
+ <td>sessionAlive</td>
+ <td>label=On Demand</td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Choose Permission Setting--</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
- <td>name</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td>
<td></td>
</tr>
<tr>
- <td>type</td>
- <td>name</td>
- <td>test_por_09_008</td>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td>
+ <td></td>
</tr>
<tr>
<td>echo</td>
- <td>--Select Permission Setting--</td>
+ <td>--Choose Access Permission Setting--</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[4]//div[@class='MiddleTab']</td>
+ <td>publicMode</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>publicMode</td>
+ <td>echo</td>
+ <td>--Choose Edit Permission Setting--</td>
<td></td>
</tr>
<tr>
14 years, 2 months
gatein SVN: r2772 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-04-26 06:36:42 -0400 (Mon, 26 Apr 2010)
New Revision: 2772
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_009_CreateNewPortalWithPortalNameTheSameWithExistingButDifferentByLowerAndUpperCase.html
Log:
Change script for Test_POR_09_009_CreateNewPortalWithPortalNameTheSameWithExistingButDifferentByLowerAndUpperCase.html
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_009_CreateNewPortalWithPortalNameTheSameWithExistingButDifferentByLowerAndUpperCase.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_009_CreateNewPortalWithPortalNameTheSameWithExistingButDifferentByLowerAndUpperCase.html 2010-04-26 10:27:54 UTC (rev 2771)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_009_CreateNewPortalWithPortalNameTheSameWithExistingButDifferentByLowerAndUpperCase.html 2010-04-26 10:36:42 UTC (rev 2772)
@@ -77,11 +77,6 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>xpath=//div[@id='UISiteManagement']//div[@class='UIAction']//div[@class='ActionButton BlueButton']</td>
- <td></td>
-</tr>
-<tr>
<td>echo</td>
<td>--Choose Portal Setting--</td>
<td></td>
@@ -92,14 +87,34 @@
<td></td>
</tr>
<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>test_por_09_009</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>locale</td>
+ <td>label=English</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>skin</td>
+ <td>label=Default</td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Choose Properties--</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td>
<td></td>
</tr>
<tr>
- <td>type</td>
- <td>name</td>
- <td>test_por_09_009</td>
+ <td>select</td>
+ <td>sessionAlive</td>
+ <td>label=On Demand</td>
</tr>
<tr>
<td>echo</td>
@@ -108,15 +123,25 @@
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[4]//div[@class='MiddleTab']</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td>
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Choose Acess Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>publicMode</td>
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Choose Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Edit Permission Setting</td>
<td></td>
@@ -134,7 +159,7 @@
<tr>
<td>clickAt</td>
<td>link=Select Permission</td>
- <td></td>
+ <td>1,1</td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -222,21 +247,56 @@
<td>Test_POR_09_009</td>
</tr>
<tr>
+ <td>select</td>
+ <td>locale</td>
+ <td>label=English</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>skin</td>
+ <td>label=Default</td>
+</tr>
+<tr>
<td>echo</td>
+ <td>--Choose Properties--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>sessionAlive</td>
+ <td>label=On Demand</td>
+</tr>
+<tr>
+ <td>echo</td>
<td>--Select Permission Setting--</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[4]//div[@class='MiddleTab']</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td>
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Choose Acess Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>publicMode</td>
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Choose Edit Permission Setting--</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Edit Permission Setting</td>
<td></td>
@@ -327,6 +387,11 @@
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Return to Portal Navigation to detele portal--</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Site</td>
<td></td>
14 years, 2 months
gatein SVN: r2771 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-04-26 06:27:54 -0400 (Mon, 26 Apr 2010)
New Revision: 2771
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_004_CreateNewPortalWithNameStartNumber.html
Log:
Change script for Test_POR_09_004_CreateNewPortalWithNameStartNumber.html
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_004_CreateNewPortalWithNameStartNumber.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_004_CreateNewPortalWithNameStartNumber.html 2010-04-26 10:11:04 UTC (rev 2770)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_004_CreateNewPortalWithNameStartNumber.html 2010-04-26 10:27:54 UTC (rev 2771)
@@ -122,8 +122,13 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
- <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[3]/div/div</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td>
<td></td>
</tr>
<tr>
14 years, 2 months
gatein SVN: r2770 - in components/wsrp/trunk: common and 4 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-04-26 06:11:04 -0400 (Mon, 26 Apr 2010)
New Revision: 2770
Added:
components/wsrp/trunk/common/src/main/resources/
components/wsrp/trunk/common/src/main/resources/wsrp.properties
components/wsrp/trunk/common/src/test/java/org/gatein/wsrp/WSRPConstantsTestCase.java
Modified:
components/wsrp/trunk/UpdateWSRPForGateIn.sh
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java
Log:
- GTNWSRP-32: Automated changing WSRP service version via Maven.
- Removed version checking in UpdateWSRPForGatein.sh as it's now automated via Maven.
Modified: components/wsrp/trunk/UpdateWSRPForGateIn.sh
===================================================================
--- components/wsrp/trunk/UpdateWSRPForGateIn.sh 2010-04-26 09:52:25 UTC (rev 2769)
+++ components/wsrp/trunk/UpdateWSRPForGateIn.sh 2010-04-26 10:11:04 UTC (rev 2770)
@@ -40,14 +40,6 @@
echo Current WSRP version in project POM: \'$CURRENT_WSRP\'
echo
-# Check that WSRP service version as defined by WSRPConstants.WSRP_SERVICE_VERSION is in sync with project POM
-WSRP_SERVICE_VERSION=`grep WSRP_SERVICE_VERSION common/src/main/java/org/gatein/wsrp/WSRPConstants.java | sed -n -e 's/.*"\(.*\)".*/\1/p'`
-if [ $WSRP_SERVICE_VERSION != $CURRENT_WSRP ]
-then
- echo \=\=\> Please update WSRPConstants.WSRP_SERVICE_VERSION \($WSRP_SERVICE_VERSION\) as it doesn\'t match the value in the project POM
- exit
-fi
-
# If we have no argument, build. If you don't want to build just add an argument (value irrelevant) when calling the script
if [ $# -eq 0 ]
then
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-04-26 09:52:25 UTC (rev 2769)
+++ components/wsrp/trunk/common/pom.xml 2010-04-26 10:11:04 UTC (rev 2770)
@@ -20,7 +20,8 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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">
+<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.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -74,4 +75,13 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java 2010-04-26 09:52:25 UTC (rev 2769)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java 2010-04-26 10:11:04 UTC (rev 2770)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2009, Red Hat Middleware, LLC, and individual
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
* contributors as indicated by the @authors tag. See the
* copyright.txt in the distribution for a full listing of
* individual contributors.
@@ -26,12 +26,14 @@
import org.gatein.pc.api.spi.PortalContext;
import javax.xml.namespace.QName;
+import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
+import java.util.Properties;
import java.util.Random;
/**
@@ -43,16 +45,33 @@
{
// JMX **************************************************************************************************************
/** JMX object name for the Portal web app registry */
- @Deprecated public static final String WEB_APP_REGISTRY_OBJECT_NAME = "portal:service=WebAppRegistry";
+ @Deprecated
+ public static final String WEB_APP_REGISTRY_OBJECT_NAME = "portal:service=WebAppRegistry";
/** JMX object name for the WSRP Producer */
- @Deprecated public static final String WSRP_PRODUCER_OBJECT_NAME = "portletcontainer.wsrp:service=WSRPProducer";
+ @Deprecated
+ public static final String WSRP_PRODUCER_OBJECT_NAME = "portletcontainer.wsrp:service=WSRPProducer";
/**
- * The version of the WSRP service. This should match the maven version of the module. Right now, checked via
- * the UpdateWSRPForGatein.sh script.
+ * The version of the WSRP service. This should match the maven version of the module. Right now, checked via the
+ * UpdateWSRPForGatein.sh script.
*/
- public static final String WSRP_SERVICE_VERSION = "1.1.0-CR02-SNAPSHOT";
+ public static final String WSRP_SERVICE_VERSION;
+ static
+ {
+ Properties props = new Properties();
+ try
+ {
+ props.load(Thread.currentThread().getContextClassLoader().getResourceAsStream("wsrp.properties"));
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("Could not load wsrp.properties.");
+ }
+ WSRP_SERVICE_VERSION = props.getProperty("wsrp.service.version");
+ }
+
+
// Window State Names ***********************************************************************************************
/**
Added: components/wsrp/trunk/common/src/main/resources/wsrp.properties
===================================================================
--- components/wsrp/trunk/common/src/main/resources/wsrp.properties (rev 0)
+++ components/wsrp/trunk/common/src/main/resources/wsrp.properties 2010-04-26 10:11:04 UTC (rev 2770)
@@ -0,0 +1,23 @@
+#
+# JBoss, a division of Red Hat
+# Copyright 2010, Red Hat Middleware, LLC, and individual
+# contributors as indicated by the @authors tag. See the
+# copyright.txt in the distribution for a full listing of
+# individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+wsrp.service.version=${project.version}
Added: components/wsrp/trunk/common/src/test/java/org/gatein/wsrp/WSRPConstantsTestCase.java
===================================================================
--- components/wsrp/trunk/common/src/test/java/org/gatein/wsrp/WSRPConstantsTestCase.java (rev 0)
+++ components/wsrp/trunk/common/src/test/java/org/gatein/wsrp/WSRPConstantsTestCase.java 2010-04-26 10:11:04 UTC (rev 2770)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, 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.gatein.wsrp;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class WSRPConstantsTestCase extends TestCase
+{
+ public void testServiceVersion()
+ {
+ // should be equals to the interpolated ${project.version} value, "1.1.0-CR02-SNAPSHOT" when written
+ // assertEquals("1.1.0-CR02-SNAPSHOT", WSRPConstants.WSRP_SERVICE_VERSION);
+ assertFalse(WSRPConstants.WSRP_SERVICE_VERSION.equals("${project.version}"));
+ }
+}
14 years, 2 months
gatein SVN: r2769 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: mvanco(a)redhat.com
Date: 2010-04-26 05:52:25 -0400 (Mon, 26 Apr 2010)
New Revision: 2769
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html
Log:
UI Tests: fixed SNF_PRL_18 - select template tab when adding portal was removed, changed identifier of tab
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html 2010-04-26 09:51:10 UTC (rev 2768)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html 2010-04-26 09:52:25 UTC (rev 2769)
@@ -68,15 +68,10 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td>
+ <td>name</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td>
- <td></td>
-</tr>
-<tr>
<td>type</td>
<td>name</td>
<td>test_portal_18</td>
@@ -88,7 +83,7 @@
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[4]//div[@class='MiddleTab']</td>
+ <td>//div[contains(@onclick, 'eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane') and contains(@onclick, 'PermissionSetting')]</td>
<td></td>
</tr>
<tr>
@@ -212,8 +207,8 @@
<td></td>
</tr>
<tr>
- <td>waitForTextPresent</td>
- <td>Portal Navigation</td>
+ <td>waitForTextNotPresent</td>
+ <td>test_portal_18</td>
<td></td>
</tr>
<tr>
14 years, 2 months
gatein SVN: r2768 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-04-26 05:51:10 -0400 (Mon, 26 Apr 2010)
New Revision: 2768
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_004_CutPasteNodeByAddPageWizard.html
Log:
Change script for Test_POR_25_05_004_CutPasteNodeByAddPageWizard.html
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_004_CutPasteNodeByAddPageWizard.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_004_CutPasteNodeByAddPageWizard.html 2010-04-26 09:09:54 UTC (rev 2767)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_004_CutPasteNodeByAddPageWizard.html 2010-04-26 09:51:10 UTC (rev 2768)
@@ -22,7 +22,7 @@
<td></td>
</tr>
<tr>
- <td>click</td>
+ <td>clickAt</td>
<td>link=Sign in</td>
<td></td>
</tr>
@@ -167,18 +167,18 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]//a</td>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div[1]/div/a</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div/div</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div[1]/div/a</td>
<td></td>
</tr>
<tr>
<td>componentExoContextMenu</td>
- <td>xpath=//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div/div//a</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon' and @title='Test_POR_25_05_004']</td>
<td></td>
</tr>
<tr>
@@ -198,7 +198,7 @@
</tr>
<tr>
<td>componentExoContextMenu</td>
- <td>//div[@class="UIRightPopupMenuContainer"]/div[2]//a</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div/div</td>
<td></td>
</tr>
<tr>
@@ -217,13 +217,18 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]/a</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]/a</td>
<td></td>
</tr>
<tr>
<td>componentExoContextMenu</td>
- <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div//a</td>
<td></td>
</tr>
<tr>
14 years, 2 months
gatein SVN: r2767 - in components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp: handler and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-04-26 05:09:54 -0400 (Mon, 26 Apr 2010)
New Revision: 2767
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/MarkupProcessor.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/handler/RequestHeaderClientHandler.java
Log:
- Clean-ups.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/MarkupProcessor.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/MarkupProcessor.java 2010-04-26 08:36:54 UTC (rev 2766)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/MarkupProcessor.java 2010-04-26 09:09:54 UTC (rev 2767)
@@ -42,10 +42,7 @@
private final URLFormat format;
private final Set<String> supportedCustomModes;
private final Set<String> supportedCustomWindowStates;
- private final String serverAddress;
- private final String portletApplicationName;
private final String namespace;
- public static final int URL_DELIMITER_LENGTH = WSRPRewritingConstants.RESOURCE_URL_DELIMITER.length();
protected MarkupProcessor(String namespace, PortletInvocationContext context, org.gatein.pc.api.PortletContext target, URLFormat format, ProducerInfo info)
{
@@ -54,8 +51,6 @@
this.format = format;
supportedCustomModes = info.getSupportedCustomModes();
supportedCustomWindowStates = info.getSupportedCustomWindowStates();
- serverAddress = info.getEndpointConfigurationInfo().getRemoteHostAddress();
- portletApplicationName = target.getApplicationName();
}
public String getReplacementFor(String match, String prefix, String suffix)
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/handler/RequestHeaderClientHandler.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/handler/RequestHeaderClientHandler.java 2010-04-26 08:36:54 UTC (rev 2766)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/handler/RequestHeaderClientHandler.java 2010-04-26 09:09:54 UTC (rev 2767)
@@ -47,10 +47,6 @@
public class RequestHeaderClientHandler implements SOAPHandler<SOAPMessageContext>
{
private static final ThreadLocal<CurrentInfo> local = new ThreadLocal<CurrentInfo>();
- /*private static final RFC2109Spec cookieParser = new RFC2109Spec();
- private static final Logger log = LoggerFactory.getLogger(RequestHeaderClientHandler.class);
- private static final String SET_COOKIE = "Set-Cookie";
- private static final String COOKIE = "Cookie";*/
public Set<QName> getHeaders()
{
14 years, 2 months
gatein SVN: r2766 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-04-26 04:36:54 -0400 (Mon, 26 Apr 2010)
New Revision: 2766
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_001_CopyPasteNodeIntoTheSameNavigation.html
Log:
Change script for Test_POR_25_04_001_CopyPasteNodeIntoTheSameNavigation.html
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_001_CopyPasteNodeIntoTheSameNavigation.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_001_CopyPasteNodeIntoTheSameNavigation.html 2010-04-26 04:55:19 UTC (rev 2765)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_04_001_CopyPasteNodeIntoTheSameNavigation.html 2010-04-26 08:36:54 UTC (rev 2766)
@@ -77,13 +77,8 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div</td>
- <td></td>
-</tr>
-<tr>
<td>componentExoContextMenu</td>
- <td>xpath=//div[@id="UINavigationNodeSelector"]/div[3]/div/div/div/div/div/div[2]/div/div/div[2]/div[2]//a</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon' and @title='New Staff']</td>
<td></td>
</tr>
<tr>
@@ -102,11 +97,21 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]</td>
+ <td></td>
+</tr>
+<tr>
<td>componentExoContextMenu</td>
- <td>xpath=//div[@id="UINavigationManagement"]/div[2]/div/div</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]</td>
<td></td>
</tr>
<tr>
+ <td>verifyElementPresent</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>//div[@id='UINavigationNodeSelector']/div/div/div[2]/div/div/div[2]/a</td>
<td></td>
@@ -123,12 +128,12 @@
</tr>
<tr>
<td>componentExoContextMenu</td>
- <td>xpath=//div[@id="UINavigationNodeSelector"]/div/div/div/div[2]/div/div/div[3]//a</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div//a</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>//div[@id='UINavigationNodeSelector']/div/div/div/div/div//div[2]/div/div/div[7]//a</td>
+ <td>link=Delete Node</td>
<td></td>
</tr>
<tr>
14 years, 2 months
gatein SVN: r2765 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-04-26 00:55:19 -0400 (Mon, 26 Apr 2010)
New Revision: 2765
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_003_CreateNewPortalWithBlankName.html
Log:
Change script for Test_POR_09_003_CreateNewPortalWithBlankName.html
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_003_CreateNewPortalWithBlankName.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_003_CreateNewPortalWithBlankName.html 2010-04-26 04:48:44 UTC (rev 2764)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_003_CreateNewPortalWithBlankName.html 2010-04-26 04:55:19 UTC (rev 2765)
@@ -18,7 +18,7 @@
</tr>
<tr>
<td>echo</td>
- <td>--Create new portal with name start by number--</td>
+ <td>--Create new portal with name blank name--</td>
<td></td>
</tr>
<tr>
@@ -73,27 +73,17 @@
</tr>
<tr>
<td>echo</td>
- <td>--Choose Portal Template--</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>xpath=//div[@id='UISiteManagement']//div[@class='UIAction']//div[@class='ActionButton BlueButton']</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
<td>--Choose Portal Setting--</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td>
+ <td>xpath=//div[@id='UISiteManagement']//div[@class='UIAction']//div[@class='ActionButton BlueButton']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td>
+ <td>xpath=//div[@id='UISiteManagement']//div[@class='UIAction']//div[@class='ActionButton BlueButton']</td>
<td></td>
</tr>
<tr>
@@ -113,30 +103,55 @@
</tr>
<tr>
<td>echo</td>
- <td>--Choose Properties--</td>
+ <td>--Choose Properites--</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
- <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td>
<td></td>
</tr>
<tr>
+ <td>select</td>
+ <td>sessionAlive</td>
+ <td>label=On Demand</td>
+</tr>
+<tr>
<td>echo</td>
- <td>--Select Permission Setting--</td>
+ <td>--Choose Permission Setting--</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
- <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[4]//div[@class='MiddleTab']</td>
+ <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td>
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Choose Access permission Setting--</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>publicMode</td>
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Choose Edit Permission Setting--</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Edit Permission Setting</td>
<td></td>
14 years, 2 months